aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorKarsten Wiese <annabellesgarden@yahoo.de>2005-11-13 16:06:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:10 -0800
commitd6c7ac081bf6cafcf780b919ee97978f1d01a0d7 (patch)
treead8fb06018e2f89ae81e6bdc4b38f75aa546d379 /arch/x86_64
parent47936357c0d14809c3c9547e532511f6625654b2 (diff)
[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>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/i8259.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index c6c9791d77c..a9368d4c4ab 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,
};