diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /include/linux/regulator/driver.h | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/regulator/driver.h')
| -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 225f733e7533..ce1be708ca16 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
| @@ -193,6 +193,8 @@ void *rdev_get_drvdata(struct regulator_dev *rdev); | |||
| 193 | struct device *rdev_get_dev(struct regulator_dev *rdev); | 193 | struct device *rdev_get_dev(struct regulator_dev *rdev); |
| 194 | int rdev_get_id(struct regulator_dev *rdev); | 194 | int rdev_get_id(struct regulator_dev *rdev); |
| 195 | 195 | ||
| 196 | int regulator_mode_to_status(unsigned int); | ||
| 197 | |||
| 196 | void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data); | 198 | void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data); |
| 197 | 199 | ||
| 198 | #endif | 200 | #endif |