diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ppc/syslib/open_pic2.c | |
parent | powerpc: make iSeries boot again (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip |
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/syslib/open_pic2.c')
-rw-r--r-- | arch/ppc/syslib/open_pic2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c index ef365cc04bd9..1c40049b9a45 100644 --- a/arch/ppc/syslib/open_pic2.c +++ b/arch/ppc/syslib/open_pic2.c @@ -17,7 +17,6 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/init.h> -#include <linux/irq.h> #include <linux/interrupt.h> #include <linux/sysdev.h> #include <linux/errno.h> |