diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
| commit | 101d5b713700b902b1c200cdd1925c3cb7d34567 (patch) | |
| tree | a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-x86/desc_defs.h | |
| parent | cec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff) | |
| parent | e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff) | |
Merge branch 'x86/signal' into core/signal
Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/desc_defs.h')
| -rw-r--r-- | include/asm-x86/desc_defs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/desc_defs.h b/include/asm-x86/desc_defs.h index f7bacf357dac..b881db664b46 100644 --- a/include/asm-x86/desc_defs.h +++ b/include/asm-x86/desc_defs.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Written 2000 by Andi Kleen */ | 1 | /* Written 2000 by Andi Kleen */ |
| 2 | #ifndef __ARCH_DESC_DEFS_H | 2 | #ifndef ASM_X86__DESC_DEFS_H |
| 3 | #define __ARCH_DESC_DEFS_H | 3 | #define ASM_X86__DESC_DEFS_H |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | * Segment descriptor structure definitions, usable from both x86_64 and i386 | 6 | * Segment descriptor structure definitions, usable from both x86_64 and i386 |
| @@ -92,4 +92,4 @@ struct desc_ptr { | |||
| 92 | 92 | ||
| 93 | #endif /* !__ASSEMBLY__ */ | 93 | #endif /* !__ASSEMBLY__ */ |
| 94 | 94 | ||
| 95 | #endif | 95 | #endif /* ASM_X86__DESC_DEFS_H */ |