powerpc: Merged asm/i8259.h

Signed-off-by: Paul Mackerras <paulus@samba.org>

include/asm-ppc/i8259.h → include/asm-powerpc/i8259.h

@@ -1,5 +1,5 @@
-#ifndef _PPC_KERNEL_i8259_H
-#define _PPC_KERNEL_i8259_H
+#ifndef _ASM_POWERPC_I8259_H
+#define _ASM_POWERPC_I8259_H
 
 #include <linux/irq.h>
 
@@ -8,4 +8,4 @@ extern struct hw_interrupt_type i8259_pic;
 extern void i8259_init(long intack_addr);
 extern int i8259_irq(struct pt_regs *regs);
 
-#endif /* _PPC_KERNEL_i8259_H */
+#endif /* _ASM_POWERPC_I8259_H */