diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-10 19:15:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-10 19:15:59 +0100 |
| commit | 5fc31b43d59a983c47c37b7a6d327f83395609ed (patch) | |
| tree | a09e68462f79fa616d08fd866764865384409b8b /include/linux/regulator | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| parent | 498e530e50ffccb979cf5f2f2e5bbce01afe1b6e (diff) | |
| download | blackbird-op-linux-5fc31b43d59a983c47c37b7a6d327f83395609ed.tar.gz blackbird-op-linux-5fc31b43d59a983c47c37b7a6d327f83395609ed.zip | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/consumer.h | 2 | ||||
| -rw-r--r-- | include/linux/regulator/driver.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index d17e1ff7ad01..aeacd624a794 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -114,7 +114,7 @@ struct regmap; #define REGULATOR_EVENT_OVER_TEMP 0x10 #define REGULATOR_EVENT_FORCE_DISABLE 0x20 #define REGULATOR_EVENT_VOLTAGE_CHANGE 0x40 -#define REGULATOR_EVENT_DISABLE 0x80 +#define REGULATOR_EVENT_DISABLE 0x80 #define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100 #define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200 #define REGULATOR_EVENT_PRE_DISABLE 0x400 diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 045f709cb89b..3429e81beca0 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -367,6 +367,7 @@ struct regulator_dev { struct device dev; struct regulation_constraints *constraints; struct regulator *supply; /* for tree */ + const char *supply_name; struct regmap *regmap; struct delayed_work disable_work; |
