diff --git a/[refs] b/[refs]
index cde19816d9ca..bb48c170b454 100644
--- 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
index 29f6af554e71..c3141565d59d 100644
--- 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)
 {