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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-powerpc
/
i8259.h
diff --git
a/include/asm-powerpc/i8259.h
b/include/asm-powerpc/i8259.h
index
0392159
..
db1362f
100644
(file)
--- a/
include/asm-powerpc/i8259.h
+++ b/
include/asm-powerpc/i8259.h
@@
-4,11
+4,14
@@
#include <linux/irq.h>
#include <linux/irq.h>
-extern struct hw_interrupt_type i8259_pic;
-
+#ifdef CONFIG_PPC_MERGE
+extern void i8259_init(struct device_node *node, unsigned long intack_addr);
+extern unsigned int i8259_irq(void);
+extern struct irq_host *i8259_get_host(void);
+#else
extern void i8259_init(unsigned long intack_addr, int offset);
extern void i8259_init(unsigned long intack_addr, int offset);
-extern int i8259_irq(
struct pt_regs *regs
);
-extern int i8259_irq_cascade(struct pt_regs *regs, void *unused);
+extern int i8259_irq(
void
);
+#endif
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_I8259_H */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_I8259_H */