diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-03-28 17:22:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 17:51:17 -0700 |
| commit | b5b4bc32b68d711f8b79a1d60e35892d761417c7 (patch) | |
| tree | b95dc1bd59f83631f5381ba8d256c9472e76806a | |
| parent | e5217fb8ae5527e95cff9474f7b3c0d8e3a35fea (diff) | |
| download | kernel_samsung_aries-b5b4bc32b68d711f8b79a1d60e35892d761417c7.zip kernel_samsung_aries-b5b4bc32b68d711f8b79a1d60e35892d761417c7.tar.gz kernel_samsung_aries-b5b4bc32b68d711f8b79a1d60e35892d761417c7.tar.bz2 | |
ARM: mx51_efika: fix build error due to new mfd changes
MFD changes in 4ec1b54c ('mfd: mfd_cell is now implicitly available to
mc13xxx drivers') changed the mc13xxx_platform_data struct layout.
At the time all users were changed, but this driver was introduced in
another tree at the same time. This updates the mc13xxx_platform_data
user, fixing a build error.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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 51a67fc..868af8f 100644 --- a/arch/arm/mach-mx5/mx51_efika.c +++ b/arch/arm/mach-mx5/mx51_efika.c @@ -572,8 +572,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 = { |