From 15e08ef74f4beeffd16af3c291270584208effca Mon Sep 17 00:00:00 2001 From: Andrzej Zaborowski Date: Sun, 10 Jun 2007 14:36:34 +0200 Subject: [PATCH] ARM: OMAP: Fix omap1510-generic board compilation Move an #endif so that it doesn't hide the mmc config declaration. Minor formatting change. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-generic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 228fd00c11e..4b35f1676f4 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -55,6 +55,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = { .hmc_mode = 16, .pins[0] = 6, }; +#endif static struct omap_mmc_config generic_mmc_config __initdata = { .mmc [0] = { @@ -73,15 +74,13 @@ static struct omap_mmc_config generic_mmc_config __initdata = { }, }; -#endif - static struct omap_uart_config generic_uart_config __initdata = { .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), }; static struct omap_board_config_kernel generic_config[] __initdata = { - { OMAP_TAG_USB, NULL }, - { OMAP_TAG_MMC, &generic_mmc_config }, + { OMAP_TAG_USB, NULL }, + { OMAP_TAG_MMC, &generic_mmc_config }, { OMAP_TAG_UART, &generic_uart_config }, }; -- 2.41.1