From: Chris Wright Lost when merged with i386. Happy to drop, but I suspect Andi would rather not break existing users (I noticed because it was part of my testing). If dropped, Documentation needs updating. Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Cc: Andi Kleen --- arch/i386/kernel/hpet.c | 7 +++++++ 1 file changed, 7 insertions(+) Index: linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c =================================================================== --- linux-2.6.22-rc4-mm.orig/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200 +++ linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200 @@ -89,6 +89,13 @@ static int __init hpet_setup(char* str) } __setup("hpet=", hpet_setup); +static int __init disable_hpet(char *str) +{ + boot_hpet_disable = 1; + return 1; +} +__setup("nohpet", disable_hpet); + static inline int is_hpet_capable(void) { return (!boot_hpet_disable && hpet_address); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/