diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-02-02 13:57:25 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-02-15 10:27:52 +0100 |
commit | 5a8efa37f7f3da1c630e1343ecf434d2f7e85b5b (patch) | |
tree | c81f926805f089be735fb7d702cb073a5a87beed | |
parent | b90de6bf9af25646062f9ba85d2c7a4572cedb50 (diff) |
Revert "Revert "mach-ux500: musb: Now musb is always in OTG mode""
This reverts commit 21ca9f7303abf7fb599c1be81fa74d700e3df63b.
-rw-r--r-- | arch/arm/mach-ux500/usb.c | 6 |
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, }; |