diff options
| author | Ingo Molnar | 2008-10-06 16:15:57 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-06 16:15:57 +0200 |
| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
| tree | a49c776b88db5346eaef6082c271f5d79319654f /arch/x86/boot | |
| parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Merge branch 'linus' into x86/header-guards (diff) | |
| download | kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.tar.gz kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.tar.xz kernel-qcow2-linux-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.zip | |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 9fea73706479..aaf5a2131efc 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -16,7 +16,7 @@ */ #undef CONFIG_PARAVIRT #ifdef CONFIG_X86_32 -#define _ASM_DESC_H_ 1 +#define ASM_X86__DESC_H 1 #endif #ifdef CONFIG_X86_64 |