Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / include / asm-powerpc / hw_irq.h

diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h
index 605a65e420639186f0fd463c791701d9db803ab5..26b89d859c56e24245a72cdad5e314a1612f5ef5 100644 (file)
--- a/include/asm-powerpc/hw_irq.h
+++ b/include/asm-powerpc/hw_irq.h
@@ -10,10 +10,8 @@
 #include <linux/errno.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
-#include <asm/irq.h>
 
 extern void timer_interrupt(struct pt_regs *);
-extern void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq);
 
 #ifdef CONFIG_PPC_ISERIES