omap2/3/4: ehci: avoid compiler error with touchbook
authorFelipe Balbi <felipe.balbi@nokia.com>
Thu, 4 Mar 2010 07:45:53 +0000 (09:45 +0200)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Mar 2010 17:32:03 +0000 (09:32 -0800)
commit6f69a1815a93722b360a1439934856e766509002
tree481edc7df03ca6fb72c1b71496ee89f08c378f6e
parentd2197e1e6038bb01568367a220e4a4e040f8337d
omap2/3/4: ehci: avoid compiler error with touchbook

the early_param() call in board-omap3touchbook.c expands to:

static const char __setup_str_early_touchbook_revision[]
__section(.init.rodata) _aligned(1) = tbr;
[...]

and we have a non-const variable being added to the
same section:

static struct ehci_hcd_omap_platform_data ehci_pdata
__section(.init.rodata);

because of that, gcc generates a section type conflict
which can (and actually should) be avoided by marking
const every variable marked with __initconst.

This patch fixes that for the ehci_hdc_omap_platform_data.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
14 files changed:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-zoom3.c
arch/arm/mach-omap2/usb-ehci.c
arch/arm/plat-omap/include/plat/usb.h