diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 13:26:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 13:26:27 +0200 |
| commit | 101d5b713700b902b1c200cdd1925c3cb7d34567 (patch) | |
| tree | a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-x86/sparsemem.h | |
| parent | pcmcia: Fix broken abuse of dev->driver_data (diff) | |
| parent | x86: signal: introduce do_rt_sigreturn() (diff) | |
| download | linux-101d5b713700b902b1c200cdd1925c3cb7d34567.tar.xz linux-101d5b713700b902b1c200cdd1925c3cb7d34567.zip | |
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/sparsemem.h')
| -rw-r--r-- | include/asm-x86/sparsemem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/sparsemem.h b/include/asm-x86/sparsemem.h index 9bd48b0a534b..38f8e6bc3186 100644 --- a/include/asm-x86/sparsemem.h +++ b/include/asm-x86/sparsemem.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_SPARSEMEM_H -#define _ASM_X86_SPARSEMEM_H +#ifndef ASM_X86__SPARSEMEM_H +#define ASM_X86__SPARSEMEM_H #ifdef CONFIG_SPARSEMEM /* @@ -31,4 +31,4 @@ #endif #endif /* CONFIG_SPARSEMEM */ -#endif +#endif /* ASM_X86__SPARSEMEM_H */ |