Merge branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git] / arch / arm / mach-aaec2000 / aaed2000.c
index 83f57da..81a3ecc 100644 (file)
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/aaed2000.h>
+#include <mach/aaed2000.h>
 
 #include "core.h"