From: Greg Kroah-Hartman Date: Fri, 16 Nov 2012 01:50:14 +0000 (-0800) Subject: Staging: ipack: CONFIG_HOTPLUG is always enabled X-Git-Tag: next-20121205~26^2~304 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdbd3b38d3bf664e5c04904bd734ac79660e41b5;p=karo-tx-linux.git 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 Cc: Jens Taprogge Signed-off-by: Greg Kroah-Hartman --- 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, \