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;