linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / bridge / br_sysfs_br.c

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 61f00fa..6f577f1 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -11,6 +11,7 @@
  *     2 of the License, or (at your option) any later version.
  */
 
+#include <linux/capability.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/if_bridge.h>
@@ -300,25 +301,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 +335,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);