Merge tag 's390-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-microblaze.git] / drivers / hwmon / ltc4261.c
index c415829..1dab84b 100644 (file)
@@ -190,8 +190,7 @@ static struct attribute *ltc4261_attrs[] = {
 };
 ATTRIBUTE_GROUPS(ltc4261);
 
-static int ltc4261_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ltc4261_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct device *dev = &client->dev;
@@ -234,7 +233,7 @@ static struct i2c_driver ltc4261_driver = {
        .driver = {
                   .name = "ltc4261",
                   },
-       .probe = ltc4261_probe,
+       .probe_new = ltc4261_probe,
        .id_table = ltc4261_id,
 };