diff options
author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:17:23 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:17:23 +0900 |
commit | bde1e61b8e18a0654be78576ab2b0bdfeb5ca05d (patch) | |
tree | a69c813942b330baee582c3cf865748ea9bdbb03 /include/linux/regulator | |
parent | Merge remote-tracking branches 'regulator/fix/isl9305', 'regulator/fix/rk808' and 'regulator/fix/tps65023' into regulator-linus (diff) | |
parent | regulator: core: Allow dummy regulators for supplies (diff) | |
download | linux-dev-bde1e61b8e18a0654be78576ab2b0bdfeb5ca05d.tar.xz linux-dev-bde1e61b8e18a0654be78576ab2b0bdfeb5ca05d.zip |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r-- | include/linux/regulator/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index dac8e7b16bc6..4cb1c9be6073 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -429,6 +429,8 @@ struct regulator_dev { struct regulator_enable_gpio *ena_pin; unsigned int ena_gpio_state:1; + unsigned int is_switch:1; + /* time when this regulator was disabled last time */ unsigned long last_off_jiffy; }; |