From 7278aae6976963b7603be67da3051bf630cd919c Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Dec 2012 13:01:28 -0800
Subject: [PATCH] --- yaml --- r: 348175 b: refs/heads/master c:
 b92c914d02ad7a77513076515ffe9f26db1fe8af h: refs/heads/master i:   348173:
 842a47162e25e65aa8377866e625d65e4f307708   348171:
 dbf0e05ffbc719a285a6e5e3fae03888b3855bde   348167:
 e56ceb7951a2bb157c5a4b93e2a7488b785674d8   348159:
 2fe83f96eeb18257230da3d40c2bf8ef29ceb30d v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/zorro/zorro-driver.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index faac9c048caa..fa5c23250c8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 345a52558ecd7e7c4cbbce58f3f9f3588dd1015c
+refs/heads/master: b92c914d02ad7a77513076515ffe9f26db1fe8af
diff --git a/trunk/drivers/zorro/zorro-driver.c b/trunk/drivers/zorro/zorro-driver.c
index 229624f867d3..ac1db7f1bcab 100644
--- a/trunk/drivers/zorro/zorro-driver.c
+++ b/trunk/drivers/zorro/zorro-driver.c
@@ -142,7 +142,6 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv)
 
 static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-#ifdef CONFIG_HOTPLUG
 	struct zorro_dev *z;
 
 	if (!dev)
@@ -159,9 +158,6 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
 		return -ENOMEM;
 
 	return 0;
-#else /* !CONFIG_HOTPLUG */
-	return -ENODEV;
-#endif /* !CONFIG_HOTPLUG */
 }
 
 struct bus_type zorro_bus_type = {