Commit b92c914d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 345a5255
...@@ -142,7 +142,6 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv) ...@@ -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) static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
#ifdef CONFIG_HOTPLUG
struct zorro_dev *z; struct zorro_dev *z;
if (!dev) if (!dev)
...@@ -159,9 +158,6 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -159,9 +158,6 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
#else /* !CONFIG_HOTPLUG */
return -ENODEV;
#endif /* !CONFIG_HOTPLUG */
} }
struct bus_type zorro_bus_type = { struct bus_type zorro_bus_type = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment