diff options
| author | Nishanth Menon <nm@ti.com> | 2014-06-30 11:57:35 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-03 10:25:52 -0400 |
| commit | e7cf34ef396d6ceaa776661830d4ce332da650f0 (patch) | |
| tree | d54a94a652d3cf06cfdde238b1fbf941b400239a /include/linux/mfd | |
| parent | 4b09e17b6f9cec1b50991fa66d7b51bef38221d8 (diff) | |
regulator: palmas: Rename reg_info to palmas_reg_info
reg_info is a generic term which might cause conflict at a later point
in time. To prevent such a thing from occuring in future, rename to
palmas_reg_info.
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/palmas.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 1a045ba32c13..fb0390a1a498 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h | |||
| @@ -102,7 +102,7 @@ struct palmas_sleep_requestor_info { | |||
| 102 | int bit_pos; | 102 | int bit_pos; |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | struct regs_info { | 105 | struct palmas_regs_info { |
| 106 | char *name; | 106 | char *name; |
| 107 | char *sname; | 107 | char *sname; |
| 108 | u8 vsel_addr; | 108 | u8 vsel_addr; |
| @@ -117,7 +117,7 @@ struct palmas_pmic_driver_data { | |||
| 117 | int ldo_begin; | 117 | int ldo_begin; |
| 118 | int ldo_end; | 118 | int ldo_end; |
| 119 | int max_reg; | 119 | int max_reg; |
| 120 | struct regs_info *palmas_regs_info; | 120 | struct palmas_regs_info *palmas_regs_info; |
| 121 | struct of_regulator_match *palmas_matches; | 121 | struct of_regulator_match *palmas_matches; |
| 122 | struct palmas_sleep_requestor_info *sleep_req_info; | 122 | struct palmas_sleep_requestor_info *sleep_req_info; |
| 123 | int (*smps_register)(struct palmas_pmic *pmic, | 123 | int (*smps_register)(struct palmas_pmic *pmic, |
