From fd2d0652319cac08e7e992a4d489aa73ec7f2cb3 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Sat, 14 Jan 2006 20:01:02 +0000
Subject: [PATCH] --- yaml --- r: 20018 b: refs/heads/master c:
 e485981e52b476c1b6a00873c2f8b75b3168718f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 01d80f300a37..4161272a3a7f 100644
--- 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
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)
 {