diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-02-14 08:36:17 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-14 08:36:17 -0800 |
| commit | 64ff1673332a1109780d731ca08dcd4f8ad33097 (patch) | |
| tree | abb03dcda3da9eeb4e92a97acc0f67b55bc23599 /arch/arm/mach-omap2/board-omap3pandora.c | |
| parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) | |
| parent | 42973159599086c48c58ad79b9ad0758da6bc256 (diff) | |
| download | blackbird-op-linux-64ff1673332a1109780d731ca08dcd4f8ad33097.tar.gz blackbird-op-linux-64ff1673332a1109780d731ca08dcd4f8ad33097.zip | |
Merge branch 'usbhost17-for-arm-soc' of git://github.com/rogerq/linux into omap-for-v3.9/usb
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index a53a6683c1b8..145a6f87b71a 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -567,7 +567,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = { &pandora_backlight, }; -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, |
