Index: firmware/export/config.h
===================================================================
--- firmware/export/config.h    (revision 23465)
+++ firmware/export/config.h    (working copy)
@@ -830,18 +830,21 @@

 #if defined(HAVE_USBSTACK)
 /* Define the implemented USB transport classes */
-#if CONFIG_USBOTG == USBOTG_ISP1583
+#if (CONFIG_USBOTG == USBOTG_ISP1583) || \
+    defined(CPU_TCC780X) || \
+    defined(CPU_TCC77X)
+
 #define USB_HAS_BULK
-#elif (CONFIG_USBOTG == USBOTG_ARC) || \
+
+#elif \
+    (CONFIG_USBOTG == USBOTG_ARC) || \
     (CONFIG_USBOTG == USBOTG_JZ4740) || \
-    (CONFIG_USBOTG == USBOTG_M66591)
+    (CONFIG_USBOTG == USBOTG_M66591) || \
+    (CONFIG_USBOTG == USBOTG_S3C6400X)
+
 #define USB_HAS_BULK
 #define USB_HAS_INTERRUPT
-#elif defined(CPU_TCC780X) || defined(CPU_TCC77X)
-#define USB_HAS_BULK
-#elif CONFIG_USBOTG == USBOTG_S3C6400X
-#define USB_HAS_BULK
-#define USB_HAS_INTERRUPT
+
 #endif /* CONFIG_USBOTG */

 /* define the class drivers to enable */