public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: OMAP: Fix MMC2 device configuration for OMAP2430
@ 2008-04-24 19:25 Seth Forshee
  2008-04-24 21:30 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Seth Forshee @ 2008-04-24 19:25 UTC (permalink / raw)
  To: linux-omap

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 <seth.forshee@gmail.com>
---
 arch/arm/plat-omap/devices.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 6f07451..099182b 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;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM: OMAP: Fix MMC2 device configuration for OMAP2430
  2008-04-24 19:25 [PATCH] ARM: OMAP: Fix MMC2 device configuration for OMAP2430 Seth Forshee
@ 2008-04-24 21:30 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2008-04-24 21:30 UTC (permalink / raw)
  To: linux-omap

* Seth Forshee <seth.forshee@gmail.com> [080424 12:27]:
> Currently the MMC2 device configuration is defined for OMAP2430
> when CONFIG_ARCH_OMAP243X is defined.  This should be
> CONFIG_ARCH_OMAP2430.

Thanks, pushing today.

Tony

> Signed-off-by: Seth Forshee <seth.forshee@gmail.com>
> ---
>  arch/arm/plat-omap/devices.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
> index 6f07451..099182b 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;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-04-24 21:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-24 19:25 [PATCH] ARM: OMAP: Fix MMC2 device configuration for OMAP2430 Seth Forshee
2008-04-24 21:30 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox