aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 17:50:14 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 17:50:14 -0800
commitbdbd3b38d3bf664e5c04904bd734ac79660e41b5 (patch)
treed6e888777369a6302ad33c4b30a7997b5635cb45
parentusb: usbip: userspace: remove the port state file when detaching port. (diff)
downloadlinux-dev-bdbd3b38d3bf664e5c04904bd734ac79660e41b5.tar.xz
linux-dev-bdbd3b38d3bf664e5c04904bd734ac79660e41b5.zip
Staging: ipack: CONFIG_HOTPLUG is always enabled
as CONFIG_HOTPLUG is always enabled now, just remove the #ifdef logic in the ipack core for it if was disabled. Cc:Samuel Iglesias Gonsalvez <siglesias@igalia.com> Cc: Jens Taprogge <jens.taprogge@taprogge.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ipack/ipack.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/ipack/ipack.c b/drivers/staging/ipack/ipack.c
index f713ab3e83b7..429696bc544b 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/staging/ipack/ipack.c
@@ -85,8 +85,6 @@ static int ipack_bus_remove(struct device *device)
return 0;
}
-#ifdef CONFIG_HOTPLUG
-
static int ipack_uevent(struct device *dev, struct kobj_uevent_env *env)
{
struct ipack_device *idev;
@@ -104,12 +102,6 @@ static int ipack_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0;
}
-#else /* !CONFIG_HOTPLUG */
-
-#define ipack_uevent NULL
-
-#endif /* !CONFIG_HOTPLUG */
-
#define ipack_device_attr(field, format_string) \
static ssize_t \
field##_show(struct device *dev, struct device_attribute *attr, \