diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
| commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/i8259.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/i8259.h')
| -rw-r--r-- | include/asm-x86/i8259.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/i8259.h b/include/asm-x86/i8259.h index 2f98df91f1f2..c586559a6957 100644 --- a/include/asm-x86/i8259.h +++ b/include/asm-x86/i8259.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_I8259_H__ | 1 | #ifndef ASM_X86__I8259_H |
| 2 | #define __ASM_I8259_H__ | 2 | #define ASM_X86__I8259_H |
| 3 | 3 | ||
| 4 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
| 5 | 5 | ||
| @@ -57,4 +57,4 @@ static inline void outb_pic(unsigned char value, unsigned int port) | |||
| 57 | 57 | ||
| 58 | extern struct irq_chip i8259A_chip; | 58 | extern struct irq_chip i8259A_chip; |
| 59 | 59 | ||
| 60 | #endif /* __ASM_I8259_H__ */ | 60 | #endif /* ASM_X86__I8259_H */ |