diff options
author | Andres Salomon <dilinger@queued.net> | 2011-03-04 11:06:53 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-25 03:22:52 -0400 |
commit | 251290a6078cb88382344b3ee535ae8c6254c1b5 (patch) | |
tree | 1b74da09648394e00f85e02f99bbb7d5e0fa38b3 | |
parent | 58d5ad5e3c39311835ffcf80353d1318e4f9c155 (diff) |
ARM: mx51_efika: update platform data for new mfd changes
Note that this relies on stuff currently in mfd's next tree, but this
is also a newer driver. I'm not sure which tree it should go through,
as it's a problem that shows up in next.
From: Andres Salomon <dilinger@queued.net>
MFD changes in c738892f cause the mc13xxx_platform_data struct
to change. This changes one more (new) user of it, fixing a build
error.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-mx5/mx51_efika.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c index 07aea9c1ad9f..d0c7075937cf 100644 --- a/arch/arm/mach-mx5/mx51_efika.c +++ b/arch/arm/mach-mx5/mx51_efika.c | |||
@@ -571,8 +571,10 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = { | |||
571 | 571 | ||
572 | static struct mc13xxx_platform_data mx51_efika_mc13892_data = { | 572 | static struct mc13xxx_platform_data mx51_efika_mc13892_data = { |
573 | .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR, | 573 | .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR, |
574 | .num_regulators = ARRAY_SIZE(mx51_efika_regulators), | 574 | .regulators = { |
575 | .regulators = mx51_efika_regulators, | 575 | .num_regulators = ARRAY_SIZE(mx51_efika_regulators), |
576 | .regulators = mx51_efika_regulators, | ||
577 | }, | ||
576 | }; | 578 | }; |
577 | 579 | ||
578 | static struct spi_board_info mx51_efika_spi_board_info[] __initdata = { | 580 | static struct spi_board_info mx51_efika_spi_board_info[] __initdata = { |