diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:02 -0400 |
| commit | 42398dbdea411eec0ec3d469df0eeb2e4089d9ab (patch) | |
| tree | 951d0591f3a30f5be0a1285e0abd769bf887c1de /include/linux/mfd | |
| parent | dc49f3d5eb93217b598383e9cbefe7df819ab267 (diff) | |
| parent | 69c3f7239e29216fbf92a39c86b4e9cc63cd6d74 (diff) | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index bdba8c61207b..f543de91ce19 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h | |||
| @@ -63,7 +63,7 @@ struct mfd_cell { | |||
| 63 | /* A list of regulator supplies that should be mapped to the MFD | 63 | /* A list of regulator supplies that should be mapped to the MFD |
| 64 | * device rather than the child device when requested | 64 | * device rather than the child device when requested |
| 65 | */ | 65 | */ |
| 66 | const char **parent_supplies; | 66 | const char * const *parent_supplies; |
| 67 | int num_parent_supplies; | 67 | int num_parent_supplies; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||