summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-11 09:28:16 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-11 09:59:44 +1000
commit3b341c1c410078bdc4128e08d4dfeef491697198 (patch)
tree49a769713c4e541829240cf04842413d2c372d62
parent508c40227caee4cef0e963e61a3a5172a108b455 (diff)
downloadlinux-stable-3b341c1c410078bdc4128e08d4dfeef491697198.tar.gz
linux-stable-3b341c1c410078bdc4128e08d4dfeef491697198.tar.bz2
linux-stable-3b341c1c410078bdc4128e08d4dfeef491697198.zip
powerpc: Merged asm/i8259.h
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--include/asm-powerpc/i8259.h (renamed from include/asm-ppc/i8259.h)6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/i8259.h b/include/asm-powerpc/i8259.h
index 091b71295de4..9521ad47740f 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 */