summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-11-10 09:11:03 +0100
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2011-11-10 11:12:24 -0700
commitac28162fc038d50e64ff2e81d64046be22533e0f (patch)
treee655764dad9175e4cc91d5d16d15bdefb299f37e
parentc0df3f438607821632109a85c70659d3867f6e2a (diff)
mach-ux500: musb: Now musb is always in OTG mode
This changed is needed since "usb: musb: drop a gigantic amount of ifdeferry" introduced by Felipe Balbi <balbi@ti.com>. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/usb.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 363282eae61..1e7c0cc912e 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -105,13 +105,7 @@ static struct musb_hdrc_config musb_hdrc_config = {
};
static struct musb_hdrc_platform_data musb_platform_data = {
-#if defined(CONFIG_USB_MUSB_OTG)
.mode = MUSB_OTG,
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
- .mode = MUSB_PERIPHERAL,
-#else /* defined(CONFIG_USB_MUSB_HOST) */
- .mode = MUSB_HOST,
-#endif
.config = &musb_hdrc_config,
.board_data = &musb_board_data,
};