projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6-microblaze.git]
/
drivers
/
base
/
memory.c
diff --git
a/drivers/base/memory.c
b/drivers/base/memory.c
index
7868707
..
7ae413f
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 = {
#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)
};
static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)