History

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

Linus Torvalds committed 18 years ago

Commit 1a2edea2 parents f589b86 17d57a96 files · +33 −6Browse files

Showing the changes to include (1 of 6 files). Show all

Unified · Split

include/asm-x86/hpet.h+1−0
@@ -61,6 +61,7 @@ extern unsigned long force_hpet_address; · 60 unmodified lines
61extern int hpet_force_user;61extern int hpet_force_user;
62extern int is_hpet_enabled(void);62extern int is_hpet_enabled(void);
63extern int hpet_enable(void);63extern int hpet_enable(void);
64extern void hpet_disable(void);
64extern unsigned long hpet_readl(unsigned long a);65extern unsigned long hpet_readl(unsigned long a);
65extern void force_hpet_resume(void);66extern void force_hpet_resume(void);
66 67