diff options
| author | Venki Pallipadi <venkatesh.pallipadi@intel.com> | 2007-10-12 17:04:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 17:04:24 -0400 |
| commit | bfe0c1cc6456bba1f4e3cc1fe29c0ea578ac763a (patch) | |
| tree | 7bf60e24749a33fdac079a9c9829da24cf468e00 /include/asm-x86/hpet.h | |
| parent | 59c69f2a51b41e9886b85f61c04e8d0d2a35f37b (diff) | |
x86: HPET force enable for ICH5
force_enable hpet for ICH5.
[ Build fixes from Andrew Morton ]
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/hpet.h')
| -rw-r--r-- | include/asm-x86/hpet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h index 47de4b8cdda9..d4ab6db050b6 100644 --- a/include/asm-x86/hpet.h +++ b/include/asm-x86/hpet.h | |||
| @@ -67,7 +67,7 @@ extern unsigned long force_hpet_address; | |||
| 67 | extern int is_hpet_enabled(void); | 67 | extern int is_hpet_enabled(void); |
| 68 | extern int hpet_enable(void); | 68 | extern int hpet_enable(void); |
| 69 | extern unsigned long hpet_readl(unsigned long a); | 69 | extern unsigned long hpet_readl(unsigned long a); |
| 70 | extern void ich_force_hpet_resume(void); | 70 | extern void force_hpet_resume(void); |
| 71 | 71 | ||
| 72 | #ifdef CONFIG_HPET_EMULATE_RTC | 72 | #ifdef CONFIG_HPET_EMULATE_RTC |
| 73 | 73 | ||