Merge branch 'topic/hda' into for-linus
[pandora-kernel.git] / arch / arm / mach-at91 / irq.c
index ca87587..da3494a 100644 (file)
@@ -25,9 +25,8 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/mach-types.h>
 #include <asm/setup.h>
 
 #include <asm/mach/arch.h>