summaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:40 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:40 +0100
commit3dc06c1baf2b28e5365a1159755eac2e95142601 (patch)
tree771e1dcfd1ac5f0d2e14bec7973bcd58c9f7dfea /include/linux/regulator
parent5f19a85ba728de8a1eca8b8ae239cc27f9449985 (diff)
parent407945fd78c3fddef83ba17bf2250112c07dc7c1 (diff)
downloadop-kernel-dev-3dc06c1baf2b28e5365a1159755eac2e95142601.zip
op-kernel-dev-3dc06c1baf2b28e5365a1159755eac2e95142601.tar.gz
Merge remote-tracking branch 'regulator/topic/gpio' into v3.9-rc8
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/driver.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 0dccc91..6700cc9 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -22,6 +22,7 @@
struct regmap;
struct regulator_dev;
struct regulator_init_data;
+struct regulator_enable_gpio;
enum regulator_status {
REGULATOR_STATUS_OFF,
@@ -305,8 +306,7 @@ struct regulator_dev {
struct dentry *debugfs;
- int ena_gpio;
- unsigned int ena_gpio_invert:1;
+ struct regulator_enable_gpio *ena_pin;
unsigned int ena_gpio_state:1;
};
OpenPOWER on IntegriCloud