diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 14:39:51 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 14:39:51 -0500 |
| commit | c7ecea24e26037fdfe9cbe83c9821689336f70d5 (patch) | |
| tree | dc9b793322b95de4cffdfd9da6ba2b4ff4d0ee1b | |
| 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>
| -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 27bea540ccb..71545c95238 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) | |||
| 675 | mt46h32m32lf6_sdrc_params); | 675 | mt46h32m32lf6_sdrc_params); |
| 676 | } | 676 | } |
| 677 | 677 | ||
| 678 | #ifdef CONFIG_OMAP_MUX | ||
| 678 | static struct omap_board_mux board_mux[] __initdata = { | 679 | static struct omap_board_mux board_mux[] __initdata = { |
| 679 | /* nCS and IRQ for CM-T35 ethernet */ | 680 | /* nCS and IRQ for CM-T35 ethernet */ |
| 680 | OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0), | 681 | OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0), |
| @@ -772,6 +773,7 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 772 | 773 | ||
| 773 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 774 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 774 | }; | 775 | }; |
| 776 | #endif | ||
| 775 | 777 | ||
| 776 | static struct omap_musb_board_data musb_board_data = { | 778 | static struct omap_musb_board_data musb_board_data = { |
| 777 | .interface_type = MUSB_INTERFACE_ULPI, | 779 | .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 9da6e8240e8..4c737e4953c 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) | |||
| 260 | omap2_init_common_devices(NULL, NULL); | 260 | omap2_init_common_devices(NULL, NULL); |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | #ifdef CONFIG_OMAP_MUX | ||
| 263 | static struct omap_board_mux board_mux[] __initdata = { | 264 | static struct omap_board_mux board_mux[] __initdata = { |
| 264 | /* GPIO186 - Green LED */ | 265 | /* GPIO186 - Green LED */ |
| 265 | OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), | 266 | OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), |
| @@ -285,6 +286,7 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 285 | 286 | ||
| 286 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 287 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 287 | }; | 288 | }; |
| 289 | #endif | ||
| 288 | 290 | ||
| 289 | static void __init cm_t3517_init(void) | 291 | static void __init cm_t3517_init(void) |
| 290 | { | 292 | { |
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 728f27c5bcb..472a25b2dad 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 = { | |||
| 625 | .reset_gpio_port[2] = -EINVAL | 625 | .reset_gpio_port[2] = -EINVAL |
| 626 | }; | 626 | }; |
| 627 | 627 | ||
| 628 | #ifdef CONFIG_OMAP_MUX | ||
| 628 | static struct omap_board_mux board_mux[] __initdata = { | 629 | static struct omap_board_mux board_mux[] __initdata = { |
| 629 | /* nCS and IRQ for Devkit8000 ethernet */ | 630 | /* nCS and IRQ for Devkit8000 ethernet */ |
| 630 | OMAP3_MUX(GPMC_NCS6, OMAP_MUX_MODE0), | 631 | OMAP3_MUX(GPMC_NCS6, OMAP_MUX_MODE0), |
| @@ -778,6 +779,7 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 778 | 779 | ||
| 779 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 780 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 780 | }; | 781 | }; |
| 782 | #endif | ||
| 781 | 783 | ||
| 782 | static void __init devkit8000_init(void) | 784 | static void __init devkit8000_init(void) |
| 783 | { | 785 | { |
