diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
| commit | 99d6349978b2117ed7ca3e0e3d2d84616df323d6 (patch) | |
| tree | c75879012cba1026d3cee3ae7a793d0c525d6cc8 /drivers | |
| parent | 0c5be869ffb7de6ca1107a5804d6d4d536d80e91 (diff) | |
| parent | 1b7b72c0e96856d2b9f73f705787af3426662bcf (diff) | |
| download | qmk_firmware-99d6349978b2117ed7ca3e0e3d2d84616df323d6.tar.gz qmk_firmware-99d6349978b2117ed7ca3e0e3d2d84616df323d6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/haptic/DRV2605L.h | 2 | ||||
| -rw-r--r-- | drivers/ugfx/gdisp/is31fl3731c/driver.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/haptic/DRV2605L.h b/drivers/haptic/DRV2605L.h index 535c77765..8b8eae38b 100644 --- a/drivers/haptic/DRV2605L.h +++ b/drivers/haptic/DRV2605L.h | |||
| @@ -403,4 +403,4 @@ typedef union DRVREG_CTRL5 { /* register 0x1F */ | |||
| 403 | uint8_t C5_LRA_AUTO_OPEN_LOOP : 1; | 403 | uint8_t C5_LRA_AUTO_OPEN_LOOP : 1; |
| 404 | uint8_t C5_AUTO_OL_CNT : 2; | 404 | uint8_t C5_AUTO_OL_CNT : 2; |
| 405 | } Bits; | 405 | } Bits; |
| 406 | } DRVREG_CTRL5; \ No newline at end of file | 406 | } DRVREG_CTRL5; |
diff --git a/drivers/ugfx/gdisp/is31fl3731c/driver.mk b/drivers/ugfx/gdisp/is31fl3731c/driver.mk index 4364787c9..a53131bf3 100644 --- a/drivers/ugfx/gdisp/is31fl3731c/driver.mk +++ b/drivers/ugfx/gdisp/is31fl3731c/driver.mk | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | GFXINC += drivers/ugfx/gdisp/is31fl3731c | 1 | GFXINC += drivers/ugfx/gdisp/is31fl3731c |
| 2 | GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c | 2 | GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c |
| 3 | GDISP_DRIVER_LIST += GDISPVMT_IS31FL3731C_QMK \ No newline at end of file | 3 | GDISP_DRIVER_LIST += GDISPVMT_IS31FL3731C_QMK |