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/hpet.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/hpet.h')
| -rw-r--r-- | include/asm-x86/hpet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h index 82f1ac641bd7..cbbbb6d4dd32 100644 --- a/include/asm-x86/hpet.h +++ b/include/asm-x86/hpet.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef ASM_X86_HPET_H | 1 | #ifndef ASM_X86__HPET_H |
| 2 | #define ASM_X86_HPET_H | 2 | #define ASM_X86__HPET_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_HPET_TIMER | 4 | #ifdef CONFIG_HPET_TIMER |
| 5 | 5 | ||
| @@ -90,4 +90,4 @@ static inline int is_hpet_enabled(void) { return 0; } | |||
| 90 | #define hpet_readl(a) 0 | 90 | #define hpet_readl(a) 0 |
| 91 | 91 | ||
| 92 | #endif | 92 | #endif |
| 93 | #endif /* ASM_X86_HPET_H */ | 93 | #endif /* ASM_X86__HPET_H */ |