git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-powerpc
/
i8259.h
diff --git
a/include/asm-powerpc/i8259.h
b/include/asm-powerpc/i8259.h
index
c80e113
..
0392159
100644
(file)
--- a/
include/asm-powerpc/i8259.h
+++ b/
include/asm-powerpc/i8259.h
@@
-4,13
+4,11
@@
#include <linux/irq.h>
#include <linux/irq.h>
-#ifdef CONFIG_PPC_MERGE
-extern void i8259_init(struct device_node *node, unsigned long intack_addr);
-extern unsigned int i8259_irq(struct pt_regs *regs);
-#else
+extern struct hw_interrupt_type i8259_pic;
+
extern void i8259_init(unsigned long intack_addr, int offset);
extern int i8259_irq(struct pt_regs *regs);
extern void i8259_init(unsigned long intack_addr, int offset);
extern int i8259_irq(struct pt_regs *regs);
-#endif
+extern int i8259_irq_cascade(struct pt_regs *regs, void *unused);
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_I8259_H */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_I8259_H */