diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:56:12 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:56:12 +0400 |
| commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
| tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /include/linux/regulator/consumer.h | |
| parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
| parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) | |
| download | linux-af1910a817c5ad52c32dddacc1744cfa1b35889e.tar.xz | |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'include/linux/regulator/consumer.h')
| -rw-r--r-- | include/linux/regulator/consumer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 26f6ea4444e3..6fae97a6ce7d 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -141,6 +141,7 @@ int regulator_enable(struct regulator *regulator); int regulator_disable(struct regulator *regulator); int regulator_force_disable(struct regulator *regulator); int regulator_is_enabled(struct regulator *regulator); +int regulator_disable_deferred(struct regulator *regulator, int ms); int regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers); @@ -211,6 +212,12 @@ static inline int regulator_disable(struct regulator *regulator) return 0; } +static inline int regulator_disable_deferred(struct regulator *regulator, + int ms) +{ + return 0; +} + static inline int regulator_is_enabled(struct regulator *regulator) { return 1; |