aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/i8259.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/include/asm/i8259.h')
-rw-r--r--arch/powerpc/include/asm/i8259.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/i8259.h b/arch/powerpc/include/asm/i8259.h
index db1362f8c60..105ade297aa 100644
--- a/arch/powerpc/include/asm/i8259.h
+++ b/arch/powerpc/include/asm/i8259.h
@@ -4,14 +4,9 @@
#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(void);
extern struct irq_host *i8259_get_host(void);
-#else
-extern void i8259_init(unsigned long intack_addr, int offset);
-extern int i8259_irq(void);
-#endif
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_I8259_H */