aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/hpet.h
diff options
context:
space:
mode:
authorVenki Pallipadi <venkatesh.pallipadi@intel.com>2007-10-12 17:04:23 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 17:04:23 -0400
commit59c69f2a51b41e9886b85f61c04e8d0d2a35f37b (patch)
tree3512523870b3a34a976777c2cb332bd29d7aab59 /include/asm-x86/hpet.h
parentd54bd57d6580250e6551261f3b15c45a9d90c77b (diff)
x86: HPET try to activate force detected hpet
Enable HPET later during boot, after the force detect in PCI quirks. Also add a call to repeat the force enabling at resume time. 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index 7c933242365f..47de4b8cdda9 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -63,6 +63,7 @@
63 63
64/* hpet memory map physical address */ 64/* hpet memory map physical address */
65extern unsigned long hpet_address; 65extern unsigned long hpet_address;
66extern unsigned long force_hpet_address;
66extern int is_hpet_enabled(void); 67extern int is_hpet_enabled(void);
67extern int hpet_enable(void); 68extern int hpet_enable(void);
68extern unsigned long hpet_readl(unsigned long a); 69extern unsigned long hpet_readl(unsigned long a);