mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 14:42:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Olof Johansson
2012-11-06 08:11:50 -08:00
parent 66267ee587 baad1b33f4
commit a5434fc9e2
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-davinci/board-dm646x-evm.c
View File

@@ -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,

6
arch/arm/mach-davinci/usb.c
View File

@@ -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,
};