Commit d6c7ac08 authored Nov 13, 2005 by Karsten Wiese Committed by Linus Torvalds Nov 13, 2005

[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 <ak@muc.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 47936357

arch/x86_64/kernel/i8259.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,
		};