Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / arch / arm / mach-ux500 / cache-l2x0.c

diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index f815efe54c7356a4bf68dd388a19fb1824b6b22b..82ccf1d98735520ef4727c615398e478fccb8b02 100644 (file)
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -9,8 +9,8 @@
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/hardware.h>
 
+#include "db8500-regs.h"
 #include "id.h"
 
 static void __iomem *l2x0_base;
@@ -42,7 +42,8 @@ static int __init ux500_l2x0_init(void)
        if (cpu_is_u8500_family() || cpu_is_ux540_family())
                l2x0_base = __io_address(U8500_L2CC_BASE);
        else
-               ux500_unknown_soc();
+               /* Non-Ux500 platform */
+               return -ENODEV;
 
        /* Unlock before init */
        ux500_l2x0_unlock();