From 55eedcc333ff32aea1d35cba9f8609ba6497b773 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 06:53:45 +0100
Subject: [PATCH] --- yaml --- r: 68610 b: refs/heads/master c:
 9ec0fd4e37c7167e4f9780d5834a1d1ed8263566 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/base/memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8b707f26dcd6..58bb84938651 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409f2435205803634b67210040d785455e807b58
+refs/heads/master: 9ec0fd4e37c7167e4f9780d5834a1d1ed8263566
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
index cb99daeae936..7a1390cd6aad 100644
--- a/trunk/drivers/base/memory.c
+++ b/trunk/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;