diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:35:07 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:36:49 +0200 |
| commit | f7c490dbb283cf96867f557178978fd854e96620 (patch) | |
| tree | 47250a7fba738136ebb746483c645f2f5f77bf26 | |
| parent | 107088033cbc7dc228cedba3acb63607cf557d0b (diff) | |
| download | kernel_goldelico_gta04-f7c490dbb283cf96867f557178978fd854e96620.zip kernel_goldelico_gta04-f7c490dbb283cf96867f557178978fd854e96620.tar.gz kernel_goldelico_gta04-f7c490dbb283cf96867f557178978fd854e96620.tar.bz2 | |
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3gta04.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c index daf791f..3b3167f 100644 --- a/arch/arm/mach-omap2/board-omap3gta04.c +++ b/arch/arm/mach-omap2/board-omap3gta04.c @@ -1199,7 +1199,7 @@ static struct platform_device *gta04_devices[] __initdata = { &madc_hwmon, }; -static const struct usbhs_omap_board_data usbhs_bdata __initconst = { +static struct usbhs_omap_platform_data usbhs_bdata __initconst = { /* HSUSB0 - is not a EHCI port; TPS65950 configured by twl4030.c and musb driver */ .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, /* HSUSB1 - n/a */ |