diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-12 10:15:57 +0400 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-12 10:15:57 +0400 |
| commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
| tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /drivers/hwmon/hih6130.c | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
| download | linux-76d8a23b127020472207b281427d3e9f4f1227e4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/hwmon/hih6130.c')
| -rw-r--r-- | drivers/hwmon/hih6130.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c index 9a675efaa78d..2dc37c7c6947 100644 --- a/drivers/hwmon/hih6130.c +++ b/drivers/hwmon/hih6130.c @@ -220,7 +220,7 @@ static const struct attribute_group hih6130_attr_group = { * device's name. * Returns 0 on success. */ -static int __devinit hih6130_probe(struct i2c_client *client, +static int hih6130_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct hih6130 *hih6130; @@ -263,7 +263,7 @@ fail_remove_sysfs: * hih6130_remove() - remove device * @client: I2C client device */ -static int __devexit hih6130_remove(struct i2c_client *client) +static int hih6130_remove(struct i2c_client *client) { struct hih6130 *hih6130 = i2c_get_clientdata(client); @@ -283,7 +283,7 @@ MODULE_DEVICE_TABLE(i2c, hih6130_id); static struct i2c_driver hih6130_driver = { .driver.name = "hih6130", .probe = hih6130_probe, - .remove = __devexit_p(hih6130_remove), + .remove = hih6130_remove, .id_table = hih6130_id, }; |