Merge branch 'linux-2.6'

[linux-2.6] / arch / powerpc / platforms / powermac / pic.c

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index cd7216437416412fdaefebecd73c41a509189c26..40736400ef80c2455e763d630175c93de73f22a9 100644 (file)
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -663,7 +663,7 @@ static int pmacpic_resume(struct sys_device *sysdev)
 #endif /* CONFIG_PM && CONFIG_PPC32 */
 
 static struct sysdev_class pmacpic_sysclass = {
-       set_kset_name("pmac_pic"),
+       .name = "pmac_pic",
 };
 
 static struct sys_device device_pmacpic = {