lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

Browse Source 
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>
This commit is contained in:
Ingo Molnar
2008-10-06 16:15:57 +02:00
parent fec6ed1d1f 1503af6619
commit b8cd9d056b
285 changed files with 849 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-x86/acpi.h
View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_ACPI_H
#define _ASM_X86_ACPI_H
#ifndef ASM_X86__ACPI_H
#define ASM_X86__ACPI_H
/*
* Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
#define acpi_unlazy_tlb(x) leave_mm(x)
#endif /*__X86_ASM_ACPI_H*/
#endif /* ASM_X86__ACPI_H */