diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:01:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:01 -0500 |
commit | b92c914d02ad7a77513076515ffe9f26db1fe8af (patch) | |
tree | 9014cbb2bc88fcef06f7e52f64151376e0dddc63 /drivers/zorro | |
parent | 345a52558ecd7e7c4cbbce58f3f9f3588dd1015c (diff) |
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 229624f867d3..ac1db7f1bcab 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) | |||
142 | 142 | ||
143 | static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) | 143 | static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) |
144 | { | 144 | { |
145 | #ifdef CONFIG_HOTPLUG | ||
146 | struct zorro_dev *z; | 145 | struct zorro_dev *z; |
147 | 146 | ||
148 | if (!dev) | 147 | if (!dev) |
@@ -159,9 +158,6 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
159 | return -ENOMEM; | 158 | return -ENOMEM; |
160 | 159 | ||
161 | return 0; | 160 | return 0; |
162 | #else /* !CONFIG_HOTPLUG */ | ||
163 | return -ENODEV; | ||
164 | #endif /* !CONFIG_HOTPLUG */ | ||
165 | } | 161 | } |
166 | 162 | ||
167 | struct bus_type zorro_bus_type = { | 163 | struct bus_type zorro_bus_type = { |