Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index 1078b148ca80f9d88eaf0da2f3157386ae31ff3a..b4da9505f4d21215fd6838427553441c0f09b03d 100644 (file)
--- a/kernel/params.c
+++ b/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,
 };
 
 /*