[PATCH] ARM: OMAP: Small voiceblue update

Small voiceblue update

Signed-off-by: Ladislav Michl <MICHL@2n.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap/omap1/board-voiceblue.c b/arch/arm/mach-omap/omap1/board-voiceblue.c
index 73a0d5db7dedd00cebf2c75d482445cda20709a9..7b0ab909c34f4151604a37b59351b0d70e6cde73 100644 (file)
--- a/arch/arm/mach-omap/omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap/omap1/board-voiceblue.c
@@ -143,7 +143,7 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
        .pins[2]        = 6,
 };
 
-static struct omap_mmc_config voiceblue_mmc_config = {
+static struct omap_mmc_config voiceblue_mmc_config __initdata = {
        .mmc_blocks             = 1,
        .mmc1_power_pin         = 2,
        .mmc1_switch_pin        = -1,

diff --git a/include/asm-arm/arch-omap/board-voiceblue.h b/include/asm-arm/arch-omap/board-voiceblue.h
index 33977b8956fbb1abcaec714b839e39be6a148305..ed6d346ee12344da8fa651956b3742360b433f09 100644 (file)
--- a/include/asm-arm/arch-omap/board-voiceblue.h
+++ b/include/asm-arm/arch-omap/board-voiceblue.h
@@ -11,11 +11,6 @@
 #ifndef __ASM_ARCH_VOICEBLUE_H
 #define __ASM_ARCH_VOICEBLUE_H
 
-#if (EXTERNAL_MAX_NR_PORTS < 4)
-#undef EXTERNAL_MAX_NR_PORTS
-#define EXTERNAL_MAX_NR_PORTS  4
-#endif
-
 extern void voiceblue_wdt_enable(void);
 extern void voiceblue_wdt_disable(void);
 extern void voiceblue_wdt_ping(void);