---

yaml --- r: 19967 b: refs/heads/master c: 2139bdd h: refs/heads/master i: 19965: 5093a72 19963: a0e508e 19959: 0110f86 19951: 9aaeb4a 19935: 1c0279a 19903: 0c78e4b 19839: 114cff4 19711: 50248d8 19455: 817dcf0 v: v3
git-mirror · Feb 8, 2006 · 2ae2470 · 2ae2470
1 parent 94a56c7
commit 2ae2470
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: ce4b50f2fc62267eeaf331c41bc11b92d9bc7865
+refs/heads/master: 2139bdd5b15a4cc450adb17da836f33c16477188
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)
 {