aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-21 02:12:40 +0000
committerQMK Bot <hello@qmk.fm>2020-12-21 02:12:40 +0000
commitc8cd2caeaca0546a598715cbb87d0d6cdd6dcdeb (patch)
tree0ee5b4d68c918223e87fd5bc629a4433fa7d933c
parentd7385676bc3ef419adf76f00f42c9b19b572149e (diff)
parente3211e307ec14c326b03b39806ed7bb11b927d34 (diff)
downloadqmk_firmware-c8cd2caeaca0546a598715cbb87d0d6cdd6dcdeb.tar.gz
qmk_firmware-c8cd2caeaca0546a598715cbb87d0d6cdd6dcdeb.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--tmk_core/protocol/vusb/vusb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 9b65ba9ac..9ce75334a 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -680,7 +680,7 @@ const PROGMEM usbConfigurationDescriptor_t usbConfigurationDescriptor = {
680 }, 680 },
681 .bcdHID = 0x0101, 681 .bcdHID = 0x0101,
682 .bCountryCode = 0x00, 682 .bCountryCode = 0x00,
683 .bNumDescriptors = 2, 683 .bNumDescriptors = 1,
684 .bDescriptorType = USBDESCR_HID_REPORT, 684 .bDescriptorType = USBDESCR_HID_REPORT,
685 .wDescriptorLength = sizeof(raw_hid_report) 685 .wDescriptorLength = sizeof(raw_hid_report)
686 }, 686 },