summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 15:30:21 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 15:30:21 +0400
commit1474e4dbcae04125ed6e503eadcef266846f4675 (patch)
treeb65a1fb53b4c3c2fb669883faf0b87166b45baaf /include
parentf604c10cdeba4e068afa96be2bee878fb5227f8b (diff)
parent09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff)
downloadlinux-1474e4dbcae04125ed6e503eadcef266846f4675.tar.xz
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/driver.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index fa8b55b8191c..1dcdf00e0db2 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -184,7 +184,7 @@ struct regulator_desc {
* no other direct access).
*/
struct regulator_dev {
- struct regulator_desc *desc;
+ const struct regulator_desc *desc;
int exclusive;
u32 use_count;
u32 open_count;
@@ -210,7 +210,8 @@ struct regulator_dev {
struct dentry *debugfs;
};
-struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
+struct regulator_dev *
+regulator_register(const struct regulator_desc *regulator_desc,
struct device *dev, const struct regulator_init_data *init_data,
void *driver_data, struct device_node *of_node);
void regulator_unregister(struct regulator_dev *rdev);