aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x/fortunet.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-10 23:56:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-10 23:56:42 +0100
commit1de8cd3cb9f61e854e743c7210df43db517d4832 (patch)
tree2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /arch/arm/mach-clps711x/fortunet.c
parent1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff)
parent3d14bdad40315b54470cb7812293d14c8af2bf7d (diff)
downloadlinux-1de8cd3cb9f61e854e743c7210df43db517d4832.tar.gz
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/arm/mach-clps711x/fortunet.c')
-rw-r--r--arch/arm/mach-clps711x/fortunet.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index 7122b3d21043..7430e4049d87 100644
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -24,7 +24,6 @@
#include <linux/initrd.h>
#include <mach/hardware.h>
-#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/mach-types.h>