From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 19:55:00 +0000 (+0100)
Subject: Merge branch 'next/soc' into for-next
X-Git-Tag: next-20130220~18^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0f14730963da64df00e4cbb3d532cc39afdbc23;p=karo-tx-linux.git

Merge branch 'next/soc' into for-next
---

c0f14730963da64df00e4cbb3d532cc39afdbc23
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 475075642401,67769ef6d184..fededfadd2ad
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -448,10 -428,9 +448,10 @@@ static struct platform_device *omap3_be
  	&leds_gpio,
  	&keys_gpio,
  	&madc_hwmon,
 +	&leds_pwm,
  };
  
- static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
+ static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
  
  	.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
  	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,