diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:45:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:45:15 -0500 |
| commit | 1a2edea9aff48c31302e07100ddbaba358596cd7 (patch) | |
| tree | 7dc3c7f4b6bca030a8308537fbc7367f36c32003 /include | |
| parent | f589b86d4b6e067b720a253bdb40896857804037 (diff) | |
| parent | 17d57a9206b4de6ad082ac9f2d2346985abbd2aa (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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h index b1f3c1ea55d9..ad8d6e758785 100644 --- a/include/asm-x86/hpet.h +++ b/include/asm-x86/hpet.h | |||
| @@ -61,6 +61,7 @@ extern unsigned long force_hpet_address; | |||
| 61 | extern int hpet_force_user; | 61 | extern int hpet_force_user; |
| 62 | extern int is_hpet_enabled(void); | 62 | extern int is_hpet_enabled(void); |
| 63 | extern int hpet_enable(void); | 63 | extern int hpet_enable(void); |
| 64 | extern void hpet_disable(void); | ||
| 64 | extern unsigned long hpet_readl(unsigned long a); | 65 | extern unsigned long hpet_readl(unsigned long a); |
| 65 | extern void force_hpet_resume(void); | 66 | extern void force_hpet_resume(void); |
| 66 | 67 | ||