diff options
| author | Olof Johansson | 2012-11-06 08:11:50 -0800 |
|---|---|---|
| committer | Olof Johansson | 2012-11-06 08:11:50 -0800 |
| commit | a5434fc9e2ad9bac545f058a24b284c051a1faae (patch) | |
| tree | cb77d2c1f6cf67745d6f6848062a4536c5eb18e0 | |
| parent | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (diff) | |
| parent | baad1b33f4d86d223d665fcefa79b4acc832a269 (diff) | |
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
| -rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/usb.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 1dbf85beed1b..9211e8800c79 100644 --- 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 index f77b95336e2b..34509ffba221 100644 --- 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, }; |