From 806056535260fef49c7d182da1a69e87196236dc Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 22 Dec 2007 21:18:25 -0800
Subject: [PATCH] --- yaml --- r: 75858 b: refs/heads/master c:
 7a6a41615bfb2f03ce797bc24104c50b42c935e5 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/params.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index cbce36f54564..1fbd0e2135fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4dafc0563c6c49e17fe14b3f5f356e4c4b8806
+refs/heads/master: 7a6a41615bfb2f03ce797bc24104c50b42c935e5
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index 1078b148ca80..b4da9505f4d2 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -694,18 +694,8 @@ static struct kset_uevent_ops module_uevent_ops = {
 struct kset *module_kset;
 int module_sysfs_initialized;
 
-static void module_release(struct kobject *kobj)
-{
-	/*
-	 * Stupid empty release function to allow the memory for the kobject to
-	 * be properly cleaned up.  This will not need to be present for 2.6.25
-	 * with the upcoming kobject core rework.
-	 */
-}
-
 struct kobj_type module_ktype = {
 	.sysfs_ops =	&module_sysfs_ops,
-	.release =	module_release,
 };
 
 /*