X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_sysfs_br.c;h=98cf53c81fad2f5b5b7aa74b142b0cb92868967f;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=61f00fa3b6a8a4b2dd7d5f72521d10289c779a97;hpb=e812ccbe0c915857ebea6a632bfadc631f7504a9;p=linux-2.6.git

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 61f00fa3b..98cf53c81 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -300,25 +300,6 @@ static struct bin_attribute bridge_forward = {
 	.read = brforward_read,
 };
 
-
-/*
- * This is a dummy kset so bridge objects don't cause
- * hotplug events 
- */
-struct subsystem bridge_subsys = { 
-	.kset = { .hotplug_ops = NULL },
-};
-
-void br_sysfs_init(void)
-{
-	subsystem_register(&bridge_subsys);
-}
-
-void br_sysfs_fini(void)
-{
-	subsystem_unregister(&bridge_subsys);
-}
-
 /*
  * Add entries in sysfs onto the existing network class device
  * for the bridge.
@@ -353,7 +334,7 @@ int br_sysfs_addbr(struct net_device *dev)
 	
 	kobject_set_name(&br->ifobj, SYSFS_BRIDGE_PORT_SUBDIR);
 	br->ifobj.ktype = NULL;
-	br->ifobj.kset = &bridge_subsys.kset;
+	br->ifobj.kset = NULL;
 	br->ifobj.parent = brobj;
 
 	err = kobject_register(&br->ifobj);