diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /include/asm-powerpc/i8259.h | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-powerpc/i8259.h')
| -rw-r--r-- | include/asm-powerpc/i8259.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-powerpc/i8259.h b/include/asm-powerpc/i8259.h index 0392159e16e4..c80e113052cd 100644 --- a/include/asm-powerpc/i8259.h +++ b/include/asm-powerpc/i8259.h | |||
| @@ -4,11 +4,13 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 6 | 6 | ||
| 7 | extern struct hw_interrupt_type i8259_pic; | 7 | #ifdef CONFIG_PPC_MERGE |
| 8 | 8 | extern void i8259_init(struct device_node *node, unsigned long intack_addr); | |
| 9 | extern unsigned int i8259_irq(struct pt_regs *regs); | ||
| 10 | #else | ||
| 9 | extern void i8259_init(unsigned long intack_addr, int offset); | 11 | extern void i8259_init(unsigned long intack_addr, int offset); |
| 10 | extern int i8259_irq(struct pt_regs *regs); | 12 | extern int i8259_irq(struct pt_regs *regs); |
| 11 | extern int i8259_irq_cascade(struct pt_regs *regs, void *unused); | 13 | #endif |
| 12 | 14 | ||
| 13 | #endif /* __KERNEL__ */ | 15 | #endif /* __KERNEL__ */ |
| 14 | #endif /* _ASM_POWERPC_I8259_H */ | 16 | #endif /* _ASM_POWERPC_I8259_H */ |