Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / arch / arm / mach-lh7a40x / irq-lh7a404.c

diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c
index 5760f8c53e89207914b04b75b55f5b61eb5ea93b..12b045b688c6a60f66bab54ccb4403c83360d5a9 100644 (file)
--- a/arch/arm/mach-lh7a40x/irq-lh7a404.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c
@@ -11,12 +11,11 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/ptrace.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include "common.h"