---

yaml --- r: 348175 b: refs/heads/master c: b92c914 h: refs/heads/master i: 348173: 842a471 348171: dbf0e05 348167: e56ceb7 348159: 2fe83f9 v: v3
git-mirror · Jan 3, 2013 · 7278aae · 7278aae
1 parent a27b902
commit 7278aae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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 = {