diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-30 09:17:23 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-30 09:17:23 -0400 |
| commit | bde1e61b8e18a0654be78576ab2b0bdfeb5ca05d (patch) | |
| tree | a69c813942b330baee582c3cf865748ea9bdbb03 /include/linux/regulator | |
| parent | 6a8007c83a7bc5ccfa02b425f7463dab3dce686a (diff) | |
| parent | c93609ab3924cc974fc90001fb6aa250a8900a3c (diff) | |
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 { | |||
| 429 | struct regulator_enable_gpio *ena_pin; | 429 | struct regulator_enable_gpio *ena_pin; |
| 430 | unsigned int ena_gpio_state:1; | 430 | unsigned int ena_gpio_state:1; |
| 431 | 431 | ||
| 432 | unsigned int is_switch:1; | ||
| 433 | |||
| 432 | /* time when this regulator was disabled last time */ | 434 | /* time when this regulator was disabled last time */ |
| 433 | unsigned long last_off_jiffy; | 435 | unsigned long last_off_jiffy; |
| 434 | }; | 436 | }; |