summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 13:01:28 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 15:57:01 -0800
commitb92c914d02ad7a77513076515ffe9f26db1fe8af (patch)
tree9014cbb2bc88fcef06f7e52f64151376e0dddc63
parent345a52558ecd7e7c4cbbce58f3f9f3588dd1015c (diff)
downloadop-kernel-dev-b92c914d02ad7a77513076515ffe9f26db1fe8af.zip
op-kernel-dev-b92c914d02ad7a77513076515ffe9f26db1fe8af.tar.gz
Drivers: zorro: remove CONFIG_HOTPLUG usage
CONFIG_HOTPLUG is going away as an option, so remove it from the zorro-driver.c file. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/zorro/zorro-driver.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index 229624f..ac1db7f 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/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 = {
OpenPOWER on IntegriCloud