diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 13:01:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 15:57:01 -0800 |
| commit | b92c914d02ad7a77513076515ffe9f26db1fe8af (patch) | |
| tree | 9014cbb2bc88fcef06f7e52f64151376e0dddc63 /drivers/zorro | |
| parent | 345a52558ecd7e7c4cbbce58f3f9f3588dd1015c (diff) | |
| download | linux-3.10-b92c914d02ad7a77513076515ffe9f26db1fe8af.tar.gz linux-3.10-b92c914d02ad7a77513076515ffe9f26db1fe8af.tar.bz2 linux-3.10-b92c914d02ad7a77513076515ffe9f26db1fe8af.zip | |
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>
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index 229624f867d..ac1db7f1bca 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 = { |