From: Karsten Wiese Date: Mon, 14 Nov 2005 00:06:22 +0000 (-0800) Subject: [PATCH] x86_64 two timer entries in /sys X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6c7ac081bf6cafcf780b919ee97978f1d01a0d7;p=linux-beck.git [PATCH] x86_64 two timer entries in /sys attached patch renames one instance of /sys/devices/system/timer to /sys/devices/system/timer_pit to avoid a name clash with another instance created in time.c. Acked-by: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index c6c9791d77c1..a9368d4c4aba 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c @@ -515,7 +515,7 @@ void i8254_timer_resume(void) } static struct sysdev_class timer_sysclass = { - set_kset_name("timer"), + set_kset_name("timer_pit"), .resume = timer_resume, };