From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 16 Apr 2012 18:58:11 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/drivers'... 
X-Git-Tag: next-20120417~28^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8361f6708cca757c9a85f9a90cf6e2c9cf21a0ab;p=karo-tx-linux.git

Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/drivers' and 'regulator/topic/regmap' into regulator-next
---

8361f6708cca757c9a85f9a90cf6e2c9cf21a0ab
diff --cc drivers/regulator/core.c
index e70dd382a009,2f0d557a910d,7943fd64988d,9fafa00b8cd4..db79987b602c
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@ -2872,9 -2886,9 -2874,9 -2974,10 +2988,10 @@@@@ regulator_register(const struct regulat
    	mutex_lock(&regulator_list_mutex);
    
    	mutex_init(&rdev->mutex);
--  	rdev->reg_data = driver_data;
++  	rdev->reg_data = config->driver_data;
    	rdev->owner = regulator_desc->owner;
    	rdev->desc = regulator_desc;
+++ 	rdev->regmap = config->regmap;
    	INIT_LIST_HEAD(&rdev->consumer_list);
    	INIT_LIST_HEAD(&rdev->list);
    	BLOCKING_INIT_NOTIFIER_HEAD(&rdev->notifier);