From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Dec 2012 03:42:55 +0000 (+0900)
Subject: Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1f9cc5f7716d664bfe32289ca61327be01a0a8e3;p=deliverable%2Flinux.git

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

1f9cc5f7716d664bfe32289ca61327be01a0a8e3
diff --cc drivers/regulator/arizona-ldo1.c
index 739faf99b9e2,b44fa6f0e947..ed7beec53af8
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@@ -180,10 -67,9 +180,10 @@@ static const struct regulator_init_dat
  	.num_consumer_supplies = 1,
  };
  
- static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
+ static int arizona_ldo1_probe(struct platform_device *pdev)
  {
  	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
 +	const struct regulator_desc *desc;
  	struct regulator_config config = { };
  	struct arizona_ldo1 *ldo1;
  	int ret;