diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-26 16:57:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-26 16:57:44 +0000 |
commit | 29dbdcf3163bc05aad758e978abb66cf161e6d0e (patch) | |
tree | 9f017b0482de728a1b1b8205485b087b94a2b7f0 /drivers/regulator/dummy.c | |
parent | Linux 3.14-rc8 (diff) | |
parent | regulator: dummy: Should be always-on (diff) | |
download | linux-dev-29dbdcf3163bc05aad758e978abb66cf161e6d0e.tar.xz linux-dev-29dbdcf3163bc05aad758e978abb66cf161e6d0e.zip |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'drivers/regulator/dummy.c')
-rw-r--r-- | drivers/regulator/dummy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c index df9f42524abb..2436db9e2ca3 100644 --- a/drivers/regulator/dummy.c +++ b/drivers/regulator/dummy.c @@ -25,7 +25,11 @@ struct regulator_dev *dummy_regulator_rdev; -static struct regulator_init_data dummy_initdata; +static struct regulator_init_data dummy_initdata = { + .constraints = { + .always_on = 1, + }, +}; static struct regulator_ops dummy_ops; |