Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6] / arch / avr32 / kernel / time.c

diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 7014a3571ec024a5cdccc4161817ceb73401013b..36a46c3ae30880c8f2b478f6c9df7c2d84b27247 100644 (file)
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -214,7 +214,7 @@ void __init time_init(void)
 }
 
 static struct sysdev_class timer_class = {
-       set_kset_name("timer"),
+       .name = "timer",
 };
 
 static struct sys_device timer_device = {