summaryrefslogtreecommitdiff
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-02-12 17:00:07 +0300
committerMark Brown <broonie@kernel.org>2021-02-12 17:00:07 +0300
commitf03e2a72e5e8772ba0c2a0fc4539e4ffd03d411b (patch)
treef72806419857ff7e5f5402f182f09587056c2f25 /include/linux/mfd
parent8571bdc21388826a6feecbee2ce432839ba17d24 (diff)
parent27866e3e8a7e93494f8374f48061aa73ee46ceb2 (diff)
downloadlinux-f03e2a72e5e8772ba0c2a0fc4539e4ffd03d411b.tar.xz
Merge remote-tracking branch 'regulator/for-5.12' into regulator-next
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/abx500/ab8500.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 524a7e4702c2..302a330c5c84 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -368,7 +368,6 @@ struct ab8500 {
int it_latchhier_num;
};
-struct ab8500_regulator_platform_data;
struct ab8500_codec_platform_data;
struct ab8500_sysctrl_platform_data;
@@ -376,11 +375,9 @@ struct ab8500_sysctrl_platform_data;
* struct ab8500_platform_data - AB8500 platform data
* @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
* @init: board-specific initialization after detection of ab8500
- * @regulator: machine-specific constraints for regulators
*/
struct ab8500_platform_data {
void (*init) (struct ab8500 *);
- struct ab8500_regulator_platform_data *regulator;
struct ab8500_codec_platform_data *codec;
struct ab8500_sysctrl_platform_data *sysctrl;
};