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/vmi_time.h | |
parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) |
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/vmi_time.h')
-rw-r--r-- | include/asm-x86/vmi_time.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/vmi_time.h b/include/asm-x86/vmi_time.h index c3118c385156..b2d39e6a08b7 100644 --- a/include/asm-x86/vmi_time.h +++ b/include/asm-x86/vmi_time.h @@ -22,8 +22,8 @@ * */ -#ifndef __VMI_TIME_H -#define __VMI_TIME_H +#ifndef ASM_X86__VMI_TIME_H +#define ASM_X86__VMI_TIME_H /* * Raw VMI call indices for timer functions @@ -95,4 +95,4 @@ extern void __devinit vmi_time_ap_init(void); #define CONFIG_VMI_ALARM_HZ 100 -#endif +#endif /* ASM_X86__VMI_TIME_H */ |