diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-x86/vmi_time.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #ifndef __VMI_TIME_H | 25 | #ifndef ASM_X86__VMI_TIME_H |
| 26 | #define __VMI_TIME_H | 26 | #define ASM_X86__VMI_TIME_H |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * Raw VMI call indices for timer functions | 29 | * Raw VMI call indices for timer functions |
| @@ -95,4 +95,4 @@ extern void __devinit vmi_time_ap_init(void); | |||
| 95 | 95 | ||
| 96 | #define CONFIG_VMI_ALARM_HZ 100 | 96 | #define CONFIG_VMI_ALARM_HZ 100 |
| 97 | 97 | ||
| 98 | #endif | 98 | #endif /* ASM_X86__VMI_TIME_H */ |