diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 12:41:46 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 12:41:46 +0000 |
| commit | bca3d3dca44bbe111d8e8595932d2a9491679dab (patch) | |
| tree | c2bc30cac82cc0c9d8e27eaaaa62a206a32e88b1 | |
| parent | 802ea462d052f191a6fb4c6998c84fda934a522f (diff) | |
| download | rockbox-bca3d3dca44bbe111d8e8595932d2a9491679dab.tar.gz rockbox-bca3d3dca44bbe111d8e8595932d2a9491679dab.zip | |
Fix #ifdef nesting to allow USB_HID to be built without USB_CHARGING_ONLY (FS#10236 by Tomer Shalev)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21052 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/usbstack/usb_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index 250544f202..81333fe0d2 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
| @@ -238,6 +238,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] = | |||
| 238 | .notify_hotswap = NULL, | 238 | .notify_hotswap = NULL, |
| 239 | #endif | 239 | #endif |
| 240 | }, | 240 | }, |
| 241 | #endif | ||
| 241 | #ifdef USB_HID | 242 | #ifdef USB_HID |
| 242 | [USB_DRIVER_HID] = { | 243 | [USB_DRIVER_HID] = { |
| 243 | .enabled = false, | 244 | .enabled = false, |
| @@ -257,7 +258,6 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] = | |||
| 257 | #endif | 258 | #endif |
| 258 | }, | 259 | }, |
| 259 | #endif | 260 | #endif |
| 260 | #endif | ||
| 261 | }; | 261 | }; |
| 262 | 262 | ||
| 263 | static void usb_core_control_request_handler(struct usb_ctrlrequest* req); | 263 | static void usb_core_control_request_handler(struct usb_ctrlrequest* req); |