linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: dilinger@queued.net (Andres Salomon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mx51_efika: update platform data for new mfd changes
Date: Fri, 4 Mar 2011 08:06:53 -0800	[thread overview]
Message-ID: <20110304080653.3f2c3f19@debxo> (raw)

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>
---
 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 74991c9..6451fb4 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 = {
-- 
1.7.2.3

             reply	other threads:[~2011-03-04 16:06 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-04 16:06 Andres Salomon [this message]
2011-03-04 16:14 ` [PATCH] ARM: mx51_efika: update platform data for new mfd changes Sergei Shtylyov
2011-03-04 16:38   ` Andres Salomon
2011-03-04 18:58     ` Sergei Shtylyov
2011-03-07 14:47       ` Mark Brown
2011-03-08  5:32         ` Andres Salomon
2011-03-04 19:46     ` Uwe Kleine-König
2011-03-07  8:53 ` Sascha Hauer
2011-03-11 20:44   ` Samuel Ortiz
2011-03-15  8:33     ` Sascha Hauer
2011-03-24 20:27   ` Andres Salomon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110304080653.3f2c3f19@debxo \
    --to=dilinger@queued.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).