From 2ae24708c9a70301c6f6e424c2f144f4ee911f14 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Tue, 7 Feb 2006 12:58:20 -0800
Subject: [PATCH] --- yaml --- r: 19967 b: refs/heads/master c:
 2139bdd5b15a4cc450adb17da836f33c16477188 h: refs/heads/master i:   19965:
 5093a72cf684912b95b002d446f729a3f863a9b2   19963:
 a0e508ef9f5b0f200ba68adeb696ef75a1733cba   19959:
 0110f86360e285592b9caa5a6ac00f375452b77a   19951:
 9aaeb4ab74b8dce833320360bc14164245cd2e32   19935:
 1c0279a7c818b154143b3e3c987d24c7a66607e2   19903:
 0c78e4bbb8db8ff38c3175b2249e9c87f54cd872   19839:
 114cff433c333423863c69dbdcd818ff2c661e3a   19711:
 50248d81cf2bd0d329cff757464c69e4168b8091   19455:
 817dcf06711f146c87653a617271eb1ca79eb142 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/base/bus.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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)
 {