Automatic merge of /spare/repo/netdev-2.6 branch viro

[~andy/linux] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2b3902c867dab76cf5b9b9d65d1778be20ac20e1..3cb04bb04c2b8e0d80ad910f8b6e94935be1c089 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -390,7 +390,6 @@ void device_release_driver(struct device * dev)
                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
                sysfs_remove_link(&dev->kobj, "driver");
                list_del_init(&dev->driver_list);
-               device_detach_shutdown(dev);
                if (drv->remove)
                        drv->remove(dev);
                dev->driver = NULL;