aboutsummaryrefslogtreecommitdiff
path: root/drivers/haptic
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
committerQMK Bot <hello@qmk.fm>2020-12-11 02:46:19 +0000
commitfdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch)
tree9524405fef6cc3b16965517735dc0ef315f67ab1 /drivers/haptic
parented76f4394fd95413f7da11e2342b0965182ccb95 (diff)
parent501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff)
downloadqmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz
qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers/haptic')
-rw-r--r--drivers/haptic/solenoid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index 2975ef893..3e61d5a17 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -15,7 +15,7 @@
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18#include <timer.h> 18#include "timer.h"
19#include "solenoid.h" 19#include "solenoid.h"
20#include "haptic.h" 20#include "haptic.h"
21 21