diff options
author | Felipe Balbi <balbi@ti.com> | 2011-06-22 10:28:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 17:31:10 -0400 |
commit | 622859634a663c5e55d0e2a2cdbb55ac058d97b3 (patch) | |
tree | 5f41809476f487de7d461ccaac4d80179d0d2561 /drivers/usb/musb/davinci.c | |
parent | e4e5b136eb6f2d3aa10dca108a1b787dc92d67df (diff) |
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/davinci.c')
-rw-r--r-- | drivers/usb/musb/davinci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 2a2adf6492cd..8bdf25a8b023 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
@@ -143,12 +143,7 @@ static void davinci_musb_disable(struct musb *musb) | |||
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | ||
146 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
147 | #define portstate(stmt) stmt | 146 | #define portstate(stmt) stmt |
148 | #else | ||
149 | #define portstate(stmt) | ||
150 | #endif | ||
151 | |||
152 | 147 | ||
153 | /* | 148 | /* |
154 | * VBUS SWITCHING IS BOARD-SPECIFIC ... at least for the DM6446 EVM, | 149 | * VBUS SWITCHING IS BOARD-SPECIFIC ... at least for the DM6446 EVM, |