diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 12:10:15 -0800 |
| commit | 13ee2b943c366fc899c860b1aef1c8a2b7a0e546 (patch) | |
| tree | 7057f704ebaf7e8500133c66a58ac3db16dcf7ce /drivers/pcmcia | |
| parent | 7e4b9d0bb2a6464e541d51a1e59ba73470c7c453 (diff) | |
| download | linux-3.10-13ee2b943c366fc899c860b1aef1c8a2b7a0e546.tar.gz linux-3.10-13ee2b943c366fc899c860b1aef1c8a2b7a0e546.tar.bz2 linux-3.10-13ee2b943c366fc899c860b1aef1c8a2b7a0e546.zip | |
pcmcia: remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's
always on now in preparation of it going away as an option.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/ds.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 079629bff95..84e665961bb 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv) return 0; } -#ifdef CONFIG_HOTPLUG - static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) { struct pcmcia_device *p_dev; @@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } -#else - -static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) -{ - return -ENODEV; -} - -#endif - /************************ runtime PM support ***************************/ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); |