aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx3.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-06 10:51:06 -0500
committerOlof Johansson <olof@lixom.net>2012-11-06 10:51:06 -0500
commit66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch)
treebf7f72e623d7c1ca6472e0a1286e802cd3bff139 /arch/arm/mach-imx/mm-imx3.c
parent6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d (diff)
parentf58007762f537ba13674a3138b3f4c20fff1cba9 (diff)
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek: * 'arm-next' of git://git.xilinx.com/linux-xlnx: zynq: move static peripheral mappings zynq: remove use of CLKDEV_LOOKUP zynq: use pl310 device tree bindings zynq: use GIC device tree bindings + Linux 3.7-rc3
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
-rw-r--r--arch/arm/mach-imx/mm-imx3.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index f718bf5e964a..cefa047c4053 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -107,9 +107,8 @@ void __init imx3_init_l2x0(void)
107 } 107 }
108 108
109 l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096); 109 l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);
110 if (IS_ERR(l2x0_base)) { 110 if (!l2x0_base) {
111 printk(KERN_ERR "remapping L2 cache area failed with %ld\n", 111 printk(KERN_ERR "remapping L2 cache area failed\n");
112 PTR_ERR(l2x0_base));
113 return; 112 return;
114 } 113 }
115 114