aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:19:13 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:10:15 -0500
commit13ee2b943c366fc899c860b1aef1c8a2b7a0e546 (patch)
tree7057f704ebaf7e8500133c66a58ac3db16dcf7ce /drivers/pcmcia
parent7e4b9d0bb2a6464e541d51a1e59ba73470c7c453 (diff)
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.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 079629bff957..84e665961bbd 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)
920 return 0; 920 return 0;
921} 921}
922 922
923#ifdef CONFIG_HOTPLUG
924
925static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 923static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
926{ 924{
927 struct pcmcia_device *p_dev; 925 struct pcmcia_device *p_dev;
@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
962 return 0; 960 return 0;
963} 961}
964 962
965#else
966
967static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
968{
969 return -ENODEV;
970}
971
972#endif
973
974/************************ runtime PM support ***************************/ 963/************************ runtime PM support ***************************/
975 964
976static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); 965static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);