diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:34 +0100 |
| commit | c98cac899b6cd8ce5908c1d87708d78b41f6472d (patch) | |
| tree | a31eaf8bef22c731c03e01f92fa709a6b3b5050a /arch/arm/mach-ux500/board-mop500.c | |
| parent | 9e63d23056c0157ba2ab3a1339a8e69d759b2f34 (diff) | |
| parent | 5d9de8b1216c60c15b02982c9f6b4875f757db02 (diff) | |
| download | talos-obmc-linux-c98cac899b6cd8ce5908c1d87708d78b41f6472d.tar.gz talos-obmc-linux-c98cac899b6cd8ce5908c1d87708d78b41f6472d.zip | |
Merge remote-tracking branch 'regulator/topic/ab8500' into v3.9-rc8
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 87d2d7b38ce9..ce672378a830 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -199,10 +199,7 @@ static struct platform_device snowball_sbnet_dev = { struct ab8500_platform_data ab8500_platdata = { .irq_base = MOP500_AB8500_IRQ_BASE, - .regulator_reg_init = ab8500_regulator_reg_init, - .num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init), - .regulator = ab8500_regulators, - .num_regulator = ARRAY_SIZE(ab8500_regulators), + .regulator = &ab8500_regulator_plat_data, .gpio = &ab8500_gpio_pdata, .codec = &ab8500_codec_pdata, }; |
