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

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / irq.h

diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index 980393a16be2408b3152184e666386bbb4bfb69b..c7c3f912a3c2c426266baa0ec6f91b910be79bff 100644 (file)
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -432,6 +432,8 @@ extern unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
 extern unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
 extern atomic_t ppc_n_lost_interrupts;
 
+#define virt_irq_create_mapping(x)     (x)
+
 #endif
 
 /*
@@ -496,5 +498,7 @@ extern int call_handle_IRQ_event(int irq, struct pt_regs *regs,
 
 #endif /* CONFIG_IRQSTACKS */
 
+extern void do_IRQ(struct pt_regs *regs);
+
 #endif /* _ASM_IRQ_H */
 #endif /* __KERNEL__ */