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/apic.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/apic.h')
| -rw-r--r-- | include/asm-x86/apic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index 133c998161ca..d0ace3d63a2d 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X86_APIC_H | 1 | #ifndef ASM_X86__APIC_H |
| 2 | #define _ASM_X86_APIC_H | 2 | #define ASM_X86__APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| @@ -128,4 +128,4 @@ static inline void init_apic_mappings(void) { } | |||
| 128 | 128 | ||
| 129 | #endif /* !CONFIG_X86_LOCAL_APIC */ | 129 | #endif /* !CONFIG_X86_LOCAL_APIC */ |
| 130 | 130 | ||
| 131 | #endif /* __ASM_APIC_H */ | 131 | #endif /* ASM_X86__APIC_H */ |