diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-06-22 17:28:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 14:31:10 -0700 |
| commit | 622859634a663c5e55d0e2a2cdbb55ac058d97b3 (patch) | |
| tree | 5f41809476f487de7d461ccaac4d80179d0d2561 /drivers/usb/musb/musb_host.h | |
| parent | e4e5b136eb6f2d3aa10dca108a1b787dc92d67df (diff) | |
| download | op-kernel-dev-622859634a663c5e55d0e2a2cdbb55ac058d97b3.zip op-kernel-dev-622859634a663c5e55d0e2a2cdbb55ac058d97b3.tar.gz | |
usb: musb: drop a gigantic amount of ifdeferry
the MUSB IP is always OTG, so there's no point
in adding so many ifdefs on the code. Drop those
and always compile the driver for OTG support.
This also allows us to drop the useless "driver
mode" choice. For doing that, we need to make
musb depend on both Host and Peripheral side.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_host.h')
| -rw-r--r-- | drivers/usb/musb/musb_host.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h index 14b0077..622d09f 100644 --- a/drivers/usb/musb/musb_host.h +++ b/drivers/usb/musb/musb_host.h @@ -95,7 +95,6 @@ extern const struct hc_driver musb_hc_driver; static inline struct urb *next_urb(struct musb_qh *qh) { -#ifdef CONFIG_USB_MUSB_HDRC_HCD struct list_head *queue; if (!qh) @@ -104,9 +103,6 @@ static inline struct urb *next_urb(struct musb_qh *qh) if (list_empty(queue)) return NULL; return list_entry(queue->next, struct urb, urb_list); -#else - return NULL; -#endif } #endif /* _MUSB_HOST_H */ |
