Commit 13ee2b94 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e4b9d0b
...@@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv) ...@@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
...@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0; return 0;
} }
#else
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
return -ENODEV;
}
#endif
/************************ runtime PM support ***************************/ /************************ runtime PM support ***************************/
static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment