X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=drivers%2Fmfd%2Fda9150-core.c;h=d2c954103b2f5432eb984df6c7dd0b1ed7f1b40c;hb=69b41ac87e4a664de78a395ff97166f0b2943210;hp=6ae56e46d24e6658448fa9fdc60c67581c2d11c7;hpb=a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb;p=linux-2.6-block.git

diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 6ae56e46d24e..d2c954103b2f 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -392,8 +392,7 @@ static struct mfd_cell da9150_devs[] = {
 	},
 };
 
-static int da9150_probe(struct i2c_client *client,
-			const struct i2c_device_id *id)
+static int da9150_probe(struct i2c_client *client)
 {
 	struct da9150 *da9150;
 	struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
@@ -511,7 +510,7 @@ static struct i2c_driver da9150_driver = {
 		.name	= "da9150",
 		.of_match_table = da9150_of_match,
 	},
-	.probe		= da9150_probe,
+	.probe_new	= da9150_probe,
 	.remove		= da9150_remove,
 	.shutdown	= da9150_shutdown,
 	.id_table	= da9150_i2c_id,