Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

[linux.git] / drivers / regulator / tps65132-regulator.c

diff --git a/drivers/regulator/tps65132-regulator.c b/drivers/regulator/tps65132-regulator.c
index 7b0e38f8d62752b8c9d925f1548d66c86469dc8f..0edc83089ba2b524a70d4eabf9a2e84b820899c7 100644 (file)
--- a/drivers/regulator/tps65132-regulator.c
+++ b/drivers/regulator/tps65132-regulator.c
@@ -220,8 +220,7 @@ static const struct regmap_config tps65132_regmap_config = {
        .wr_table       = &tps65132_no_reg_table,
 };
 
-static int tps65132_probe(struct i2c_client *client,
-                         const struct i2c_device_id *client_id)
+static int tps65132_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct tps65132_regulator *tps;
@@ -272,7 +271,7 @@ static struct i2c_driver tps65132_i2c_driver = {
        .driver = {
                .name = "tps65132",
        },
-       .probe = tps65132_probe,
+       .probe_new = tps65132_probe,
        .id_table = tps65132_id,
 };