diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
| commit | fdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch) | |
| tree | 9524405fef6cc3b16965517735dc0ef315f67ab1 /quantum/split_common | |
| parent | ed76f4394fd95413f7da11e2342b0965182ccb95 (diff) | |
| parent | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff) | |
| download | qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/split_common')
| -rw-r--r-- | quantum/split_common/split_util.c | 2 | ||||
| -rw-r--r-- | quantum/split_common/transport.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index e8e944d71..97d49961d 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | #ifdef PROTOCOL_VUSB | 14 | #ifdef PROTOCOL_VUSB |
| 15 | # include "usbdrv.h" | 15 | # include <usbdrv/usbdrv.h> |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | #ifdef EE_HANDS | 18 | #ifdef EE_HANDS |
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index ccce57e44..f3e752bf9 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #include <common/matrix.h> | 3 | #include "common/matrix.h" |
| 4 | 4 | ||
| 5 | void transport_master_init(void); | 5 | void transport_master_init(void); |
| 6 | void transport_slave_init(void); | 6 | void transport_slave_init(void); |