diff --git a/firmware/usb.c b/firmware/usb.c
index 0f69bb8610..6251677e45 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -48,11 +48,10 @@
      (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \
      (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \
      (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \
-     (defined(HAVE_USBSTACK) && (defined(IPOD_NANO2G))) || \
+     (defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_S3C6400X) || \
      defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
      (CONFIG_USBOTG == USBOTG_JZ4740) || \
-     (defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525) || \
-     (defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525v2)
+     (defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525)
 #define USB_FULL_INIT
 #endif