commit 622859634a663c5e55d0e2a2cdbb55ac058d97b3 Author: Felipe Balbi <balbi@xxxxxx> Date: Wed Jun 22 17:28:09 2011 +0300 usb: musb: drop a gigantic amount of ifdeferry dropped a lot of ifdefs, also the USB_MUSB_HOST, USB_MUSB_PERIPHERAL and USB_MUSB_OTG defines, which are used in arch/arm/mach-davinci/usb.c Drop them in arch/arm/mach-davinci/usb.c and set otg as mode. Signed-off-by: Heiko Schocher <hs@xxxxxxx> Cc: Felipe Balbi <balbi@xxxxxx> Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> Cc: linux-usb@xxxxxxxxxxxxxxx Cc: Wolfgang Denk <wd@xxxxxxx> --- patch checked with checkpatch, no errors/warnigs arch/arm/mach-davinci/usb.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 23d2b6d..6f72b6a 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -42,14 +42,7 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data usb_data = { -#if defined(CONFIG_USB_MUSB_OTG) - /* OTG requires a Mini-AB connector */ .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#elif defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#endif .clock = "usb", .config = &musb_config, }; -- 1.7.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html