From 7cf4c09b225bb90adbe4bed5543e79c50f40e40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 18 May 2012 16:58:03 +0200 Subject: [PATCH] --- yaml --- r: 310998 b: refs/heads/master c: f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/mm-imx3.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0f6dd59b601b..17948533234c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1064f8893ee1d16178d983928912057352362dc2 +refs/heads/master: f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916 diff --git a/trunk/arch/arm/mach-imx/mm-imx3.c b/trunk/arch/arm/mach-imx/mm-imx3.c index 74127389e7ab..6a80496d72dc 100644 --- a/trunk/arch/arm/mach-imx/mm-imx3.c +++ b/trunk/arch/arm/mach-imx/mm-imx3.c @@ -81,6 +81,7 @@ static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size, void __init imx3_init_l2x0(void) { +#ifdef CONFIG_CACHE_L2X0 void __iomem *l2x0_base; void __iomem *clkctl_base; @@ -110,6 +111,7 @@ void __init imx3_init_l2x0(void) } l2x0_init(l2x0_base, 0x00030024, 0x00000000); +#endif } #ifdef CONFIG_SOC_IMX31