diff options
| author |   Andres Salomon <dilinger@queued.net> | 2011-03-04 08:06:53 -0800 |
|---|---|---|
| committer |   Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-25 08:22:52 +0100 |
| commit | 251290a6078cb88382344b3ee535ae8c6254c1b5 (patch) | |
| tree | 1b74da09648394e00f85e02f99bbb7d5e0fa38b3 /arch/arm/mach-mx5 | |
| parent | mx2/iomux: Set direction for CSPI2 pins (diff) | |
| download | linux-dev-251290a6078cb88382344b3ee535ae8c6254c1b5.tar.xz linux-dev-251290a6078cb88382344b3ee535ae8c6254c1b5.zip | |
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>
Diffstat (limited to 'arch/arm/mach-mx5')
| -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[] = { static struct mc13xxx_platform_data mx51_efika_mc13892_data = { .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR, - .num_regulators = ARRAY_SIZE(mx51_efika_regulators), - .regulators = mx51_efika_regulators, + .regulators = { + .num_regulators = ARRAY_SIZE(mx51_efika_regulators), + .regulators = mx51_efika_regulators, + }, }; static struct spi_board_info mx51_efika_spi_board_info[] __initdata = { |