diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-11 08:47:07 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-11 08:47:07 +0000 |
| commit | 3bc436988d0a58fdd735495f07aa741660ab8e71 (patch) | |
| tree | cc29932c27f363ee13e1fa36da7d5695979b8dc8 /tmk_core/common/report.h | |
| parent | 5193a8d569ef96d5e675a210abc1c4a2e980fdaa (diff) | |
| parent | d8b9825a8bb9d249ead4194accf47b13014e5346 (diff) | |
| download | qmk_firmware-3bc436988d0a58fdd735495f07aa741660ab8e71.tar.gz qmk_firmware-3bc436988d0a58fdd735495f07aa741660ab8e71.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common/report.h')
| -rw-r--r-- | tmk_core/common/report.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h index 610addf43..5d7c5b3b2 100644 --- a/tmk_core/common/report.h +++ b/tmk_core/common/report.h | |||
| @@ -123,12 +123,6 @@ enum desktop_usages { | |||
| 123 | 123 | ||
| 124 | #define KEYBOARD_REPORT_KEYS 6 | 124 | #define KEYBOARD_REPORT_KEYS 6 |
| 125 | 125 | ||
| 126 | /* VUSB hardcodes keyboard and mouse+extrakey only */ | ||
| 127 | #if defined(PROTOCOL_VUSB) | ||
| 128 | # undef KEYBOARD_SHARED_EP | ||
| 129 | # undef MOUSE_SHARED_EP | ||
| 130 | #endif | ||
| 131 | |||
| 132 | #ifdef __cplusplus | 126 | #ifdef __cplusplus |
| 133 | extern "C" { | 127 | extern "C" { |
| 134 | #endif | 128 | #endif |