Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'davinci-for-v3.8/cleanup' of git://gitorious.org/linux-davinci/linux-davinci into next/cleanup

From Sekhar Nori:

These changes make minor clean-ups to remove some
unused MUSB defines and an unnecessary semicolon.

* tag 'davinci-for-v3.8/cleanup' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: board-dm646x-evm.c: Remove unecessary semicolon
ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc

+1 -7
+1 -1
arch/arm/mach-davinci/board-dm646x-evm.c
··· 194 194 while (ngpio--) { 195 195 leds->gpio = gpio++; 196 196 leds++; 197 - }; 197 + } 198 198 199 199 evm_led_dev = platform_device_alloc("leds-gpio", 0); 200 200 platform_device_add_data(evm_led_dev, &evm_led_data,
-6
arch/arm/mach-davinci/usb.c
··· 42 42 }; 43 43 44 44 static struct musb_hdrc_platform_data usb_data = { 45 - #if defined(CONFIG_USB_MUSB_OTG) 46 45 /* OTG requires a Mini-AB connector */ 47 46 .mode = MUSB_OTG, 48 - #elif defined(CONFIG_USB_MUSB_PERIPHERAL) 49 - .mode = MUSB_PERIPHERAL, 50 - #elif defined(CONFIG_USB_MUSB_HOST) 51 - .mode = MUSB_HOST, 52 - #endif 53 47 .clock = "usb", 54 48 .config = &musb_config, 55 49 };