projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
[powerpc.git]
/
include
/
asm-powerpc
/
i8259.h
diff --git
a/include/asm-powerpc/i8259.h
b/include/asm-powerpc/i8259.h
index
c80e113
..
db1362f
100644
(file)
--- a/
include/asm-powerpc/i8259.h
+++ b/
include/asm-powerpc/i8259.h
@@
-6,10
+6,11
@@
#ifdef CONFIG_PPC_MERGE
extern void i8259_init(struct device_node *node, unsigned long intack_addr);
#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);
+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);
#else
extern void i8259_init(unsigned long intack_addr, int offset);
-extern int i8259_irq(
struct pt_regs *regs
);
+extern int i8259_irq(
void
);
#endif
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */