From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Walmsley Subject: Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h Date: Wed, 24 Oct 2007 23:31:43 -0600 Message-ID: <20071025053143.222542615@pwsan.com> References: <471F868A.3060106@googlemail.com> Return-path: In-Reply-To: <471F868A.3060106@googlemail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces@linux.omap.com Errors-To: linux-omap-open-source-bounces@linux.omap.com To: lvcargnini@gmail.com, dirk.behme@googlemail.com, tony@atomide.com Cc: linux-omap-open-source@linux.omap.com List-Id: linux-omap@vger.kernel.org Hello Dirk, Luis, how about the patch (following in the next message) instead? That way we don't define OMAP2_CTRL_BASE for non-OMAP2 builds. Build-tested with OSK5912 default config with MMC driver enabled. - Paul >>From paul@pwsan.com Wed Oct 24 23:36:10 2007 Message-Id: <20071025053610.715631084@pwsan.com> User-Agent: quilt/0.46-1 Date: Wed, 24 Oct 2007 23:31:44 -0600 From: Paul Walmsley To: lvcargnini@gmail.com, dirk.behme@googlemail.com, tony@atomide.com Cc: linux-omap-open-source@linux.omap.com Bcc: <471F868A.3060106@googlemail.com> Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles References: <471F868A.3060106@googlemail.com> <20071025053143.222542615@pwsan.com> Content-Disposition: inline; filename=fix_omap2_ctrl_base_mmc_compile_bug.patch Replace-Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles Remove reference to OMAP2_CTRL_BASE in arch/arm/plat-omap/devices.c if we aren't building for an OMAP2 platform. Signed-off-by: Paul Walmsley --- arch/arm/plat-omap/devices.c | 2 ++ 1 file changed, 2 insertions(+) Index: linux-omap/arch/arm/plat-omap/devices.c =================================================================== --- linux-omap.orig/arch/arm/plat-omap/devices.c 2007-08-29 13:53:47.000000000 -0600 +++ linux-omap/arch/arm/plat-omap/devices.c 2007-10-24 23:29:51.000000000 -0600 @@ -339,6 +339,7 @@ omap_cfg_reg(MMC_DAT3); } } +#if defined(CONFIG_ARCH_OMAP24XX) if (mmc->internal_clock) { /* * Use internal loop-back in MMC/SDIO @@ -350,6 +351,7 @@ omap_writel(v, OMAP2_CONTROL_DEVCONF); } } +#endif mmc1_conf = *mmc; (void) platform_device_register(&mmc_omap_device1); } --