[PATCH] two sysdevs have same name

From: Li Shaohua
Date: Wed Nov 10 2004 - 02:06:53 EST


Hi,
It takes me several days to debug a resume failure and I finally found
it's a mis-merge. Two sysdevs (previous PIT and Timer, after Venki's
HPET patch) use the same name 'timer'. Please feel free to select a
different name.

PS. I'm surprised sysdev_class_register doesn't return an error in such
situation.

Thanks,
Shaohua


===== arch/i386/kernel/timers/timer_pit.c 1.14 vs edited =====
--- 1.14/arch/i386/kernel/timers/timer_pit.c 2004-08-24 03:48:32 +08:00
+++ edited/arch/i386/kernel/timers/timer_pit.c 2004-11-10 14:46:12
+08:00
@@ -181,7 +181,7 @@ static int timer_resume(struct sys_devic
}

static struct sysdev_class timer_sysclass = {
- set_kset_name("timer"),
+ set_kset_name("pit"),
.resume = timer_resume,
};

===== arch/i386/kernel/timers/timer_pit.c 1.14 vs edited =====
--- 1.14/arch/i386/kernel/timers/timer_pit.c 2004-08-24 03:48:32 +08:00
+++ edited/arch/i386/kernel/timers/timer_pit.c 2004-11-10 14:46:12 +08:00
@@ -181,7 +181,7 @@ static int timer_resume(struct sys_devic
}

static struct sysdev_class timer_sysclass = {
- set_kset_name("timer"),
+ set_kset_name("pit"),
.resume = timer_resume,
};