diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-10 19:28:16 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 19:59:44 -0400 |
| commit | 3b341c1c410078bdc4128e08d4dfeef491697198 (patch) | |
| tree | 49a769713c4e541829240cf04842413d2c372d62 /include | |
| parent | 508c40227caee4cef0e963e61a3a5172a108b455 (diff) | |
powerpc: Merged asm/i8259.h
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -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 @@ | |||
| 1 | #ifndef _PPC_KERNEL_i8259_H | 1 | #ifndef _ASM_POWERPC_I8259_H |
| 2 | #define _PPC_KERNEL_i8259_H | 2 | #define _ASM_POWERPC_I8259_H |
| 3 | 3 | ||
| 4 | #include <linux/irq.h> | 4 | #include <linux/irq.h> |
| 5 | 5 | ||
| @@ -8,4 +8,4 @@ extern struct hw_interrupt_type i8259_pic; | |||
| 8 | extern void i8259_init(long intack_addr); | 8 | extern void i8259_init(long intack_addr); |
| 9 | extern int i8259_irq(struct pt_regs *regs); | 9 | extern int i8259_irq(struct pt_regs *regs); |
| 10 | 10 | ||
| 11 | #endif /* _PPC_KERNEL_i8259_H */ | 11 | #endif /* _ASM_POWERPC_I8259_H */ |