diff --git a/[refs] b/[refs] index 3cf4e72e625b..96a198d844ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85747311ecb6167c989093c64a13807366fdd3a9 +refs/heads/master: e5a7074a753623505ad20289abbea7a6c8c47bf7 diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index e9ac0d84a01e..6b63cc7eb71e 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -93,7 +93,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) */ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) @@ -107,10 +106,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 */ - /* i2c bus recovery routines */ static int get_scl_gpio_value(struct i2c_adapter *adap) {