diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 16:13:19 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 16:13:19 +0000 |
commit | f2e5d078f7f02d4289db31f5f63e23e39914075e (patch) | |
tree | c739a3e70846284ae2ce3d98cecc2be1ffebe2e2 /drivers/regulator/lp872x.c | |
parent | regulator: core: Optimize _regulator_do_set_voltage if voltage does not change (diff) | |
parent | Linux 3.8-rc7 (diff) | |
download | linux-dev-f2e5d078f7f02d4289db31f5f63e23e39914075e.tar.xz linux-dev-f2e5d078f7f02d4289db31f5f63e23e39914075e.zip |
Merge tag 'v3.8-rc7' into regulator-core
Linux 3.8-rc7
Diffstat (limited to 'drivers/regulator/lp872x.c')
-rw-r--r-- | drivers/regulator/lp872x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c index 708f4b6a17dc..9289ead715ca 100644 --- a/drivers/regulator/lp872x.c +++ b/drivers/regulator/lp872x.c @@ -893,7 +893,7 @@ err_dev: return ret; } -static int __devexit lp872x_remove(struct i2c_client *cl) +static int lp872x_remove(struct i2c_client *cl) { struct lp872x *lp = i2c_get_clientdata(cl); @@ -914,7 +914,7 @@ static struct i2c_driver lp872x_driver = { .owner = THIS_MODULE, }, .probe = lp872x_probe, - .remove = __devexit_p(lp872x_remove), + .remove = lp872x_remove, .id_table = lp872x_ids, }; |