deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-11-02 15:10:08 +09:00
parent 357bffe243
commit a2c45807a4
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/usb_desc.c
View File

@@ -51,7 +51,6 @@ static const uint8_t hid_report_desc[] = {
0xc0 /* END_COLLECTION */ 0xc0 /* END_COLLECTION */
}; };
>>>>>>> hid
#define USB_ICC_INTERFACE_CLASS 0x0B #define USB_ICC_INTERFACE_CLASS 0x0B
#define USB_ICC_INTERFACE_SUBCLASS 0x00 #define USB_ICC_INTERFACE_SUBCLASS 0x00
#define USB_ICC_INTERFACE_BULK_PROTOCOL 0x00 #define USB_ICC_INTERFACE_BULK_PROTOCOL 0x00