---

yaml --- r: 20018 b: refs/heads/master c: e485981 h: refs/heads/master v: v3
git-mirror · Feb 6, 2006 · fd2d065 · fd2d065
1 parent 978d6f5
commit fd2d065
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b365b3daf2a9e2a8b002ea9fef877af1c71513fd
+refs/heads/master: e485981e52b476c1b6a00873c2f8b75b3168718f
diff --git a/trunk/drivers/base/bus.c b/trunk/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)
 {