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

…inci/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
git-mirror · Nov 6, 2012 · a5434fc · a5434fc
2 parents 66267ee + baad1b3
commit a5434fc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -194,7 +194,7 @@ static int evm_led_setup(struct i2c_client *client, int gpio,
 	while (ngpio--) {
 		leds->gpio = gpio++;
 		leds++;
-	};
+	}
 
 	evm_led_dev = platform_device_alloc("leds-gpio", 0);
 	platform_device_add_data(evm_led_dev, &evm_led_data,

diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
@@ -42,14 +42,8 @@ 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,
 };