From ac28162fc038d50e64ff2e81d64046be22533e0f Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Thu, 10 Nov 2011 09:11:03 +0100 Subject: 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 . Signed-off-by: Philippe Langlais --- arch/arm/mach-ux500/usb.c | 6 ------ 1 file changed, 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, }; -- cgit v1.2.3