diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 05:13:42 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 05:13:42 +0400 |
| commit | 2e1be9f7b359d653331876968e68e849857222d3 (patch) | |
| tree | 87269c285f90342a05b661e1496b641c94865527 /drivers/regulator | |
| parent | c4578da56a022867acea2d6c6caf0301de0ff7ba (diff) | |
| parent | ad4928f1dc695ea822c4daaafa5e3b2db7b17964 (diff) | |
| download | linux-2e1be9f7b359d653331876968e68e849857222d3.tar.xz | |
Merge remote-tracking branch 'regulator/topic/max8925' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max8925-regulator.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; |