Commit d6c7ac08 authored by Karsten Wiese's avatar Karsten Wiese Committed by Linus Torvalds

[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: default avatarAndi Kleen <ak@muc.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 47936357
...@@ -515,7 +515,7 @@ void i8254_timer_resume(void) ...@@ -515,7 +515,7 @@ void i8254_timer_resume(void)
} }
static struct sysdev_class timer_sysclass = { static struct sysdev_class timer_sysclass = {
set_kset_name("timer"), set_kset_name("timer_pit"),
.resume = timer_resume, .resume = timer_resume,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment