Index: firmware/usb.c
===================================================================
--- firmware/usb.c	(revision 23050)
+++ firmware/usb.c	(working copy)
@@ -301,7 +301,7 @@
 #ifdef USB_ENABLE_STORAGE
                 usb_core_enable_driver(USB_DRIVER_MASS_STORAGE, true);
 #endif
-#ifdef USB_ENABLE_HID
+#if defined(USB_ENABLE_HID) && !defined(NO_MSC_HID)
                 usb_core_enable_driver(USB_DRIVER_HID, true);
 #endif
 #ifdef USB_ENABLE_CHARGING_ONLY