On Mon, 19 Nov 2012 13:19:11 -0500, Bill Pemberton wrote: > 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@xxxxxxxxxxxx> > Cc: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> > Cc: "Ben Dooks " <ben-linux@xxxxxxxxx> > Cc: linux-i2c@xxxxxxxxxxxxxxx > --- > drivers/i2c/i2c-core.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index a7edf98..9cebac0 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -86,9 +86,6 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) > return 0; > } > > -#ifdef CONFIG_HOTPLUG > - > -/* uevent helps with hotplug: modprobe -q $(MODALIAS) */ What was wrong with this comment? > static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) > { > struct i2c_client *client = to_i2c_client(dev); > @@ -100,10 +97,6 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) > return 0; > } > > -#else > -#define i2c_device_uevent NULL > -#endif /* CONFIG_HOTPLUG */ > - > static int i2c_device_probe(struct device *dev) > { > struct i2c_client *client = i2c_verify_client(dev); -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html