From 4a521fa48a9a27441ddde8c44991aa0462e2799c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 27 Aug 2012 11:37:04 -0700
Subject: [PATCH] --- yaml --- r: 323311 b: refs/heads/master c:
 f2889e650a8dbd51644997aef7bae71d6ac4d423 h: refs/heads/master i:   323309:
 1b94f8cd01bcd371ff838805b3a098f6ea6a0869   323307:
 e6c3c2ec29b72f78a4ae48f42b4f74d7283bdaf9   323303:
 fbe18d15396ae0adda251a73b4ff38c06d884190   323295:
 21bf6668c9f54d18c212b176fc0e29ce25f01e9a v: v3

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

diff --git a/[refs] b/[refs]
index f371baf7637c..3ce691f3ed3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 380a0e6f72e8d0211f48c24f293a366a53b374d7
+refs/heads/master: f2889e650a8dbd51644997aef7bae71d6ac4d423
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 2a3e4213865b..50977a69f09a 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -3020,7 +3020,8 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
 
 	/* some attributes need specific methods to be displayed */
 	if ((ops->get_voltage && ops->get_voltage(rdev) >= 0) ||
-	    (ops->get_voltage_sel && ops->get_voltage_sel(rdev) >= 0)) {
+	    (ops->get_voltage_sel && ops->get_voltage_sel(rdev) >= 0) ||
+	    (ops->list_voltage && ops->list_voltage(rdev, 0) >= 0)) {
 		status = device_create_file(dev, &dev_attr_microvolts);
 		if (status < 0)
 			return status;