From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 05:53:45 +0000 (+0100)
Subject: more uevent fallout (drivers/base/memory.c)
X-Git-Tag: v2.6.24-rc1~1330
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ec0fd4e37c7167e4f9780d5834a1d1ed8263566;p=linux-2.6-omap-h63xx.git

more uevent fallout (drivers/base/memory.c)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index cb99daeae93..7a1390cd6aa 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -34,7 +34,7 @@ static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)
 	return MEMORY_CLASS_NAME;
 }
 
-static int memory_uevent(struct kset *kset, struct kobj_uevent_env *env)
+static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uevent_env *env)
 {
 	int retval = 0;