Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-lh7a40x / irq-lh7a400.c

diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c
index 0b938e8b4d98ef4694469a7d019eabe8889c18d8..1ad3afcf6b3dc67f9712773315e733cb5ba7e285 100644 (file)
--- a/arch/arm/mach-lh7a40x/irq-lh7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a400.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"