Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / regulator / max8893.c

diff --git a/drivers/regulator/max8893.c b/drivers/regulator/max8893.c
index cb0e72948dd41c81e5c64f6e1d639ce0e0e43484..30592425e193e65259daba55d79149bf42f3d0c6 100644 (file)
--- a/drivers/regulator/max8893.c
+++ b/drivers/regulator/max8893.c
@@ -125,7 +125,7 @@ static const struct regmap_config max8893_regmap = {
        .val_bits = 8,
 };
 
-static int max8893_probe_new(struct i2c_client *i2c)
+static int max8893_probe(struct i2c_client *i2c)
 {
        int id, ret;
        struct regulator_config config = {.dev = &i2c->dev};
@@ -168,7 +168,7 @@ static const struct i2c_device_id max8893_ids[] = {
 MODULE_DEVICE_TABLE(i2c, max8893_ids);
 
 static struct i2c_driver max8893_driver = {
-       .probe          = max8893_probe_new,
+       .probe          = max8893_probe,
        .driver         = {
                .name   = "max8893",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,