Separate omap24xx specific code from arm1136

[u-boot] / cpu / arm1136 / cpu.c

diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c
index fa78eaa7f06816373982b6577ef935a306a28e4e..c27f8cd58c0cdad3e9900f4a751fe37b47082873 100644 (file)
--- a/cpu/arm1136/cpu.c
+++ b/cpu/arm1136/cpu.c
@@ -33,9 +33,6 @@
 
 #include <common.h>
 #include <command.h>
-#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
-#include <asm/arch/omap2420.h>
-#endif
 
 #ifdef CONFIG_USE_IRQ
 DECLARE_GLOBAL_DATA_PTR;
@@ -47,10 +44,10 @@ static unsigned long read_p15_c1 (void)
        unsigned long value;
 
        __asm__ __volatile__(
-                                               "mrc    p15, 0, %0, c1, c0, 0   @ read control reg\n"
-                                               : "=r" (value)
-                                               :
-                                               : "memory");
+                               "mrc    p15, 0, %0, c1, c0, 0   @ read control reg\n"
+                               : "=r" (value)
+                               :
+                               : "memory");
        return value;
 }