diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-x86/vmi_time.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.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 */ |