diff --git a/[refs] b/[refs]
index 4ec783357643..2a53bf58a32a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb1f7d10d6b6728c87f79f30d1ae844d01d3486a
+refs/heads/master: 140749e2bf8d7c80a50c9fcce1435bb2b4e423c4
diff --git a/trunk/arch/arm/mach-s3c2410/mach-bast.c b/trunk/arch/arm/mach-s3c2410/mach-bast.c
index 518727d0dfcc..661a2358ac22 100644
--- a/trunk/arch/arm/mach-s3c2410/mach-bast.c
+++ b/trunk/arch/arm/mach-s3c2410/mach-bast.c
@@ -259,7 +259,7 @@ static int bast_pm_resume(struct sys_device *sd)
 #endif
 
 static struct sysdev_class bast_pm_sysclass = {
-	set_kset_name("mach-bast"),
+	.name		= "mach-bast",
 	.suspend	= bast_pm_suspend,
 	.resume		= bast_pm_resume,
 };