Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7868707c7eda30035ea2eff7e3309011c11a2669..7ae413fdd5fc4bd1f0d1b0941316df52dbe8e11f 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -26,7 +26,7 @@
 #define MEMORY_CLASS_NAME      "memory"
 
 static struct sysdev_class memory_sysdev_class = {
-       set_kset_name(MEMORY_CLASS_NAME),
+       .name = MEMORY_CLASS_NAME,
 };
 
 static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)