Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[deliverable/linux.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 26a06b801b5b24d3e77f3b8465026314c64624d6..181ed2660b33b7f4e96e18250b493edd90539def 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -21,8 +21,7 @@
 #include "power/power.h"
 
 /* /sys/devices/system */
-/* FIXME: make static after drivers/base/sys.c is deleted */
-struct kset *system_kset;
+static struct kset *system_kset;
 
 #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
 
@@ -744,7 +743,6 @@ int bus_add_driver(struct device_driver *drv)
                }
        }
 
-       kobject_uevent(&priv->kobj, KOBJ_ADD);
        return 0;
 
 out_unregister: