diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 10:29:00 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 10:29:00 +0100 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/base/bus.c | |
| parent | [libata sata_sil] implement 'slow_down' module parameter (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.tar.xz linux-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/base/bus.c')
| -rw-r--r-- | drivers/base/bus.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 29f6af554e71..c3141565d59d 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -133,6 +133,8 @@ static struct kobj_type ktype_bus = { decl_subsys(bus, &ktype_bus, NULL); +#ifdef CONFIG_HOTPLUG + /* Manually detach a device from its associated driver. */ static int driver_helper(struct device *dev, void *data) { @@ -193,6 +195,7 @@ static ssize_t driver_bind(struct device_driver *drv, } static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind); +#endif static struct device * next_device(struct klist_iter * i) { |