diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2017-10-26 16:32:53 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2017-10-26 16:32:53 -0400 |
| commit | e4a46c8d8805e7a0e7a49de00bd52d9e5681f429 (patch) | |
| tree | 538f56d0a1904ceba1fd629d0fe02244e2df503e /firmware/usb.c | |
| parent | 1654efc31339972d0e6bd41a499fcffc0a45822e (diff) | |
| download | rockbox-e4a46c8d8805e7a0e7a49de00bd52d9e5681f429.tar.gz rockbox-e4a46c8d8805e7a0e7a49de00bd52d9e5681f429.zip | |
Fix a few missed things in 16454efc (and hopefully clear the red).
Change-Id: I2ce88e4c41e6e08efbfbdf261122318dfb0f8b0f
Diffstat (limited to 'firmware/usb.c')
| -rw-r--r-- | firmware/usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index 5e3795dd48..562734c84a 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
| @@ -45,10 +45,13 @@ | |||
| 45 | /* Conditions under which we want the entire driver */ | 45 | /* Conditions under which we want the entire driver */ |
| 46 | #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \ | 46 | #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \ |
| 47 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ | 47 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ |
| 48 | (defined(HAVE_USBSTACK) && defined(IPOD_NANO2G)) || \ | ||
| 48 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ | 49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ |
| 49 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ | 50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ |
| 50 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ | 51 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
| 51 | (CONFIG_USBOTG == USBOTG_JZ4740) | 52 | (CONFIG_USBOTG == USBOTG_JZ4740) |
| 53 | /* TODO: condition should be reset to be only the original | ||
| 54 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) */ | ||
| 52 | #define USB_FULL_INIT | 55 | #define USB_FULL_INIT |
| 53 | #endif | 56 | #endif |
| 54 | 57 | ||