From: Paul Mackerras <paulus@samba.org>
Date: Mon, 10 Oct 2005 23:28:16 +0000 (+1000)
Subject: powerpc: Merged asm/i8259.h
X-Git-Tag: v2.6.15-rc1~59^2~195
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3b341c1c410078bdc4128e08d4dfeef491697198;p=linux-2.6-omap-h63xx.git

powerpc: Merged asm/i8259.h

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

diff --git a/include/asm-ppc/i8259.h b/include/asm-powerpc/i8259.h
similarity index 62%
rename from include/asm-ppc/i8259.h
rename to include/asm-powerpc/i8259.h
index 091b71295de..9521ad47740 100644
--- a/include/asm-ppc/i8259.h
+++ b/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 */