From 9fac8e1d8cf36ecb780e418dde2146787c183c90 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Sep 2011 10:37:31 -0700
Subject: [PATCH] --- yaml --- r: 272411 b: refs/heads/master c:
 2c1ba398ac9da3305815f6ae8e95ae2b9fd3b5ff h: refs/heads/master i:   272409:
 e194c19f164029c30adf9a8e93bd28929ff4b42b   272407:
 423196e1ae818ca8d2e8cfdfa0dbc98e05376251 v: v3

---
 [refs]                                          | 2 +-
 trunk/Documentation/power/regulator/machine.txt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d11ea14ffdbd..2b563ec35865 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 437afd2ad6ba252fdbad9a1ad2610992fea55bd6
+refs/heads/master: 2c1ba398ac9da3305815f6ae8e95ae2b9fd3b5ff
diff --git a/trunk/Documentation/power/regulator/machine.txt b/trunk/Documentation/power/regulator/machine.txt
index b42419b52e44..311c61f2feaa 100644
--- a/trunk/Documentation/power/regulator/machine.txt
+++ b/trunk/Documentation/power/regulator/machine.txt
@@ -16,7 +16,7 @@ initialisation code by creating a struct regulator_consumer_supply for
 each regulator.
 
 struct regulator_consumer_supply {
-	struct device *dev;	/* consumer */
+	const char *dev_name;	/* consumer dev_name() */
 	const char *supply;	/* consumer supply - e.g. "vcc" */
 };
 
@@ -24,13 +24,13 @@ e.g. for the machine above
 
 static struct regulator_consumer_supply regulator1_consumers[] = {
 {
-	.dev	= &platform_consumerB_device.dev,
-	.supply	= "Vcc",
+	.dev_name	= "dev_name(consumer B)",
+	.supply		= "Vcc",
 },};
 
 static struct regulator_consumer_supply regulator2_consumers[] = {
 {
-	.dev	= &platform_consumerA_device.dev,
+	.dev	= "dev_name(consumer A"),
 	.supply	= "Vcc",
 },};