From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 8 Mar 2013 09:45:44 +0000 (+0800)
Subject: Merge remote-tracking branch 'regulator/topic/max8925' into regulator-next
X-Git-Tag: next-20130312~36^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d9a15b3b7a8ce65db37a86a6113a4c5d6abd881;hp=981c0059df6e4f812954b59d7ef339f85d0e3838;p=karo-tx-linux.git

Merge remote-tracking branch 'regulator/topic/max8925' into regulator-next
---

diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 0d5f64a805a0..3597da8f0dca 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -246,7 +246,6 @@ static struct max8925_regulator_info max8925_regulator_info[] = {
 
 #ifdef CONFIG_OF
 static int max8925_regulator_dt_init(struct platform_device *pdev,
-				    struct max8925_regulator_info *info,
 				    struct regulator_config *config,
 				    int ridx)
 {
@@ -272,7 +271,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev,
 	return 0;
 }
 #else
-#define max8925_regulator_dt_init(w, x, y, z)	(-1)
+#define max8925_regulator_dt_init(x, y, z)	(-1)
 #endif
 
 static int max8925_regulator_probe(struct platform_device *pdev)
@@ -309,7 +308,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)
 	config.dev = &pdev->dev;
 	config.driver_data = ri;
 
-	if (max8925_regulator_dt_init(pdev, ri, &config, regulator_idx))
+	if (max8925_regulator_dt_init(pdev, &config, regulator_idx))
 		if (pdata)
 			config.init_data = pdata;