From: Seth Forshee Date: Thu, 24 Apr 2008 19:25:27 +0000 (-0500) Subject: ARM: OMAP: Fix MMC2 device configuration for OMAP2430 X-Git-Tag: v2.6.26-omap1~123^2~173 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=13771e4d5bfaa1523fdab127c11522728c02ad96;p=linux-2.6-omap-h63xx.git ARM: OMAP: Fix MMC2 device configuration for OMAP2430 Currently the MMC2 device configuration is defined for OMAP2430 when CONFIG_ARCH_OMAP243X is defined. This should be CONFIG_ARCH_OMAP2430. Signed-off-by: Seth Forshee Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 6f0745165dc..099182b291e 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -202,7 +202,7 @@ static struct platform_device mmc_omap_device1 = { .resource = mmc1_resources, }; -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP243X) || \ +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \ defined(CONFIG_ARCH_OMAP34XX) static struct omap_mmc_platform_data mmc2_data; @@ -251,7 +251,7 @@ static void __init omap_init_mmc(void) if (mmc->enabled) (void) platform_device_register(&mmc_omap_device1); -#if defined(CONFIG_ARCH_OMAP243X) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) mmc = &mmc_conf->mmc[1]; if (mmc->enabled) (void) platform_device_register(&mmc_omap_device2); @@ -349,7 +349,7 @@ void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) case 1: mmc1_data = *info; break; -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP243X) || \ +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \ defined(CONFIG_ARCH_OMAP34XX) case 2: mmc2_data = *info;