Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b92c914d02ad7a77513076515ffe9f26db1fe8af

Authored by Greg Kroah-Hartman
1 parent 345a52558e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

drivers/zorro/zorro-driver.c
Diff comments   View file @ b92c914
... ... @@ -142,7 +142,6 @@
142 142  
143 143 static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
144 144 {
145   -#ifdef CONFIG_HOTPLUG
146 145 struct zorro_dev *z;
147 146  
148 147 if (!dev)
... ... @@ -159,9 +158,6 @@
159 158 return -ENOMEM;
160 159  
161 160 return 0;
162   -#else /* !CONFIG_HOTPLUG */
163   - return -ENODEV;
164   -#endif /* !CONFIG_HOTPLUG */
165 161 }
166 162  
167 163 struct bus_type zorro_bus_type = {