Index: firmware/usb.c
===================================================================
--- firmware/usb.c	(revision 23051)
+++ firmware/usb.c	(working copy)
@@ -302,8 +302,12 @@
                 usb_core_enable_driver(USB_DRIVER_MASS_STORAGE, true);
 #endif
 #ifdef USB_ENABLE_HID
+#ifndef NO_MSC_HID
                 usb_core_enable_driver(USB_DRIVER_HID, true);
+#else
+                usb_core_enable_driver(USB_DRIVER_HID, false);
 #endif
+#endif
 #ifdef USB_ENABLE_CHARGING_ONLY
                 usb_core_enable_driver(USB_DRIVER_CHARGING_ONLY, false);
 #endif