X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Fhwmon%2Fnct7904.c;h=b1c837fc407af9bdb2175fe496b6aa46cea9eca1;hb=ff5232956e074994a66656f709c3ad1ee3d8a550;hp=242ff8bee78dd718405210800e9086c67faac77f;hpb=064841ccfc49b2315dc0b797239862d3a343aa07;p=linux-2.6-microblaze.git

diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 242ff8bee78d..b1c837fc407a 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -1009,8 +1009,7 @@ static const struct watchdog_ops nct7904_wdt_ops = {
 	.get_timeleft	= nct7904_wdt_get_timeleft,
 };
 
-static int nct7904_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int nct7904_probe(struct i2c_client *client)
 {
 	struct nct7904_data *data;
 	struct device *hwmon_dev;
@@ -1172,7 +1171,7 @@ static struct i2c_driver nct7904_driver = {
 	.driver = {
 		.name = "nct7904",
 	},
-	.probe = nct7904_probe,
+	.probe_new = nct7904_probe,
 	.id_table = nct7904_id,
 	.detect = nct7904_detect,
 	.address_list = normal_i2c,