diff options
| author | Felipe Balbi <felipe.balbi@nokia.com> | 2010-03-04 10:45:53 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-11 20:32:03 +0300 |
| commit | 6f69a1815a93722b360a1439934856e766509002 (patch) | |
| tree | 481edc7df03ca6fb72c1b71496ee89f08c378f6e /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | d2197e1e6038bb01568367a220e4a4e040f8337d (diff) | |
| download | linux-6f69a1815a93722b360a1439934856e766509002.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
| -rwxr-xr-x | arch/arm/mach-omap2/board-3630sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 4386d2b4a785..a0a2a113465c 100755 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -54,7 +54,7 @@ static void enable_board_wakeup_source(void) OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); } -static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { +static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, |