diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 11:39:51 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 11:39:51 -0800 |
| commit | c7ecea24e26037fdfe9cbe83c9821689336f70d5 (patch) | |
| tree | dc9b793322b95de4cffdfd9da6ba2b4ff4d0ee1b /arch | |
| parent | 573efc2babf76422ebc5b373562a4c40d715b88e (diff) | |
omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
Fix compile when CONFIG_OMAP_MUX is not selected
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 27bea540ccbb..71545c95238c 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -675,6 +675,7 @@ static void __init cm_t35_init_early(void) mt46h32m32lf6_sdrc_params); } +#ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { /* nCS and IRQ for CM-T35 ethernet */ OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0), @@ -772,6 +773,7 @@ static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; +#endif static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 9da6e8240e8b..4c737e4953ca 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c @@ -260,6 +260,7 @@ static void __init cm_t3517_init_early(void) omap2_init_common_devices(NULL, NULL); } +#ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { /* GPIO186 - Green LED */ OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), @@ -285,6 +286,7 @@ static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; +#endif static void __init cm_t3517_init(void) { diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 728f27c5bcb1..472a25b2dadd 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -625,6 +625,7 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { .reset_gpio_port[2] = -EINVAL }; +#ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { /* nCS and IRQ for Devkit8000 ethernet */ OMAP3_MUX(GPMC_NCS6, OMAP_MUX_MODE0), @@ -778,6 +779,7 @@ static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; +#endif static void __init devkit8000_init(void) { |