Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...

[karo-tx-linux.git] / drivers / power / lp8727_charger.c

diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index c628224b7f58788b94df718fb087c1b56e5a03ed..4ee71a90e2483f90a32cc2857a0b95833d7cffb8 100644 (file)
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -522,7 +522,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        return 0;
 }
 
-static int __devexit lp8727_remove(struct i2c_client *cl)
+static int lp8727_remove(struct i2c_client *cl)
 {
        struct lp8727_chg *pchg = i2c_get_clientdata(cl);
 
@@ -542,7 +542,7 @@ static struct i2c_driver lp8727_driver = {
                   .name = "lp8727",
                   },
        .probe = lp8727_probe,
-       .remove = __devexit_p(lp8727_remove),
+       .remove = lp8727_remove,
        .id_table = lp8727_ids,
 };
 module_i2c_driver(lp8727_driver);