diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /include/asm-x86/desc.h | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'include/asm-x86/desc.h')
| -rw-r--r-- | include/asm-x86/desc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 06f786f4b4fb..ebc307817e98 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_DESC_H_ | 1 | #ifndef ASM_X86__DESC_H |
| 2 | #define _ASM_DESC_H_ | 2 | #define ASM_X86__DESC_H |
| 3 | 3 | ||
| 4 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
| 5 | #include <asm/desc_defs.h> | 5 | #include <asm/desc_defs.h> |
| @@ -410,4 +410,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist) | |||
| 410 | 410 | ||
| 411 | #endif /* __ASSEMBLY__ */ | 411 | #endif /* __ASSEMBLY__ */ |
| 412 | 412 | ||
| 413 | #endif | 413 | #endif /* ASM_X86__DESC_H */ |