From c8774434687dbae82c26b0d5dbe650f8b9c9fa4c Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 31 Mar 2012 16:33:31 +0800
Subject: [PATCH] --- yaml --- r: 298589 b: refs/heads/master c:
 5f12760d289fd2da685cb54eebb08c107b146872 h: refs/heads/master i:   298587:
 9a6150144e4d6eb07d02e877595c9c2a4c7ab7ec v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/regulator/fixed-helper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16089753d53f..d196f0dd2595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e032b376551a61662b20a2c8544fbbc568ab2e7f
+refs/heads/master: 5f12760d289fd2da685cb54eebb08c107b146872
diff --git a/trunk/drivers/regulator/fixed-helper.c b/trunk/drivers/regulator/fixed-helper.c
index 30d0a15b8949..efb52dcefd35 100644
--- a/trunk/drivers/regulator/fixed-helper.c
+++ b/trunk/drivers/regulator/fixed-helper.c
@@ -32,7 +32,7 @@ struct platform_device *regulator_register_fixed(int id,
 	if (!data)
 		return NULL;
 
-	data->cfg.supply_name = "dummy";
+	data->cfg.supply_name = "fixed-dummy";
 	data->cfg.microvolts = 0;
 	data->cfg.gpio = -EINVAL;
 	data->cfg.enabled_at_boot = 1;