]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ARM: mx51_efika: fix build error due to new mfd changes
authorAndres Salomon <dilinger@queued.net>
Tue, 29 Mar 2011 00:22:30 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2011 00:51:17 +0000 (17:51 -0700)
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>
arch/arm/mach-mx5/mx51_efika.c

index 51a67fc7f0efa3e5c865fa7fd49a8b25ad3523be..868af8f435fa6915b28127c58614a5f21a5548e7 100644 (file)
@@ -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 = {