summaryrefslogtreecommitdiff
path: root/include/linux/mfd/palmas.h
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2014-06-30 19:57:35 +0400
committerMark Brown <broonie@linaro.org>2014-07-03 18:25:52 +0400
commite7cf34ef396d6ceaa776661830d4ce332da650f0 (patch)
treed54a94a652d3cf06cfdde238b1fbf941b400239a /include/linux/mfd/palmas.h
parent4b09e17b6f9cec1b50991fa66d7b51bef38221d8 (diff)
downloadlinux-e7cf34ef396d6ceaa776661830d4ce332da650f0.tar.xz
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/palmas.h')
-rw-r--r--include/linux/mfd/palmas.h4
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 {
int bit_pos;
};
-struct regs_info {
+struct palmas_regs_info {
char *name;
char *sname;
u8 vsel_addr;
@@ -117,7 +117,7 @@ struct palmas_pmic_driver_data {
int ldo_begin;
int ldo_end;
int max_reg;
- struct regs_info *palmas_regs_info;
+ struct palmas_regs_info *palmas_regs_info;
struct of_regulator_match *palmas_matches;
struct palmas_sleep_requestor_info *sleep_req_info;
int (*smps_register)(struct palmas_pmic *pmic,