Merge branch 'linux-2.6'

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/i8237.c b/arch/x86/kernel/i8237.c
index 29313832df0c..dbd6c1d1b638 100644
--- a/arch/x86/kernel/i8237.c
+++ b/arch/x86/kernel/i8237.c
@@ -51,7 +51,7 @@ static int i8237A_suspend(struct sys_device *dev, pm_message_t state)
 }
 
 static struct sysdev_class i8237_sysdev_class = {
-        set_kset_name("i8237"),
+        .name = "i8237",
         .suspend = i8237A_suspend,
         .resume = i8237A_resume,
 };