summaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/4xx/ebony.c
diff options
context:
space:
mode:
authorPaul Mackerras2005-10-12 06:43:32 +0200
committerPaul Mackerras2005-10-12 06:43:32 +0200
commitb6ec995a21a9428aef620b5adf46d047a18d88b8 (patch)
tree6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ppc/platforms/4xx/ebony.c
parentpowerpc: make iSeries boot again (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.gz
kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz
kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/platforms/4xx/ebony.c')
-rw-r--r--arch/ppc/platforms/4xx/ebony.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 9decb72e7aaf..d32ae112f639 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -30,7 +30,6 @@
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/initrd.h>
-#include <linux/irq.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/tty.h>