aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:45:15 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:45:15 -0800
commit1a2edea9aff48c31302e07100ddbaba358596cd7 (patch)
tree7dc3c7f4b6bca030a8308537fbc7367f36c32003 /include
parentf589b86d4b6e067b720a253bdb40896857804037 (diff)
parent17d57a9206b4de6ad082ac9f2d2346985abbd2aa (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix x86-32 early fixmap initialization. x86: disable hpet legacy replacement for kdump x86: disable hpet on shutdown
Diffstat (limited to 'include')
-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 b1f3c1ea55d..ad8d6e75878 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -61,6 +61,7 @@ extern unsigned long force_hpet_address;
extern int hpet_force_user;
extern int is_hpet_enabled(void);
extern int hpet_enable(void);
+extern void hpet_disable(void);
extern unsigned long hpet_readl(unsigned long a);
extern void force_hpet_resume(void);