From: Ladislav Michl Date: Wed, 15 Jun 2005 16:57:39 +0000 (-0700) Subject: [PATCH] ARM: OMAP: Small voiceblue update X-Git-Tag: v2.6.13-omap1~115 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e3c41b155e5cf9715bf9b3d928d0fd9f2fa66a3;p=linux-2.6-omap-h63xx.git [PATCH] ARM: OMAP: Small voiceblue update Small voiceblue update Signed-off-by: Ladislav Michl Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap/omap1/board-voiceblue.c b/arch/arm/mach-omap/omap1/board-voiceblue.c index 73a0d5db7de..7b0ab909c34 100644 --- 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 33977b8956f..ed6d346ee12 100644 --- 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);