]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-ixp23xx/core.c
Merge commit 'v2.6.27-rc6' into timers/hpet
[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp23xx / core.c
index df16a4eac4907ecb03862fbbe636750724da350a..68b4ac5b24815ec5767c98bf9f93b42cd2e6110e 100644 (file)
@@ -32,8 +32,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>