diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:15:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:15:57 +0200 |
commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/gpio.h | |
parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | Merge branch 'linus' into x86/header-guards (diff) | |
download | linux-dev-b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0.tar.xz linux-dev-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 'include/asm-x86/gpio.h')
-rw-r--r-- | include/asm-x86/gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/gpio.h b/include/asm-x86/gpio.h index c4c91b37c104..497fb980d962 100644 --- a/include/asm-x86/gpio.h +++ b/include/asm-x86/gpio.h @@ -53,4 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) #endif /* CONFIG_GPIOLIB */ -#endif /* _ASM_I386_GPIO_H */ +#endif /* ASM_X86__GPIO_H */ |