linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs
@ 2011-09-26  6:50 Uwe Kleine-König
  2011-09-26 10:05 ` Samuel Ortiz
  0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2011-09-26  6:50 UTC (permalink / raw)
  To: linux-arm-kernel

This is needed with patch

	mfd: Remove mc13783 API functions and symbols

(currently cde41c030 in next)

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-imx/mach-mx31moboard.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index e910d5f..1dd16c0 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -224,7 +224,7 @@ static struct mc13xxx_regulator_init_data moboard_regulators[] = {
 	},
 };
 
-static struct mc13783_led_platform_data moboard_led[] = {
+static struct mc13xxx_led_platform_data moboard_led[] = {
 	{
 		.id = MC13783_LED_R1,
 		.name = "coreboard-led-4:red",
@@ -257,7 +257,7 @@ static struct mc13783_led_platform_data moboard_led[] = {
 	},
 };
 
-static struct mc13783_leds_platform_data moboard_leds = {
+static struct mc13xxx_leds_platform_data moboard_leds = {
 	.num_leds = ARRAY_SIZE(moboard_led),
 	.led = moboard_led,
 	.flags = MC13783_LED_SLEWLIMTC,
@@ -266,7 +266,7 @@ static struct mc13783_leds_platform_data moboard_leds = {
 	.tc2_period = MC13783_LED_PERIOD_10MS,
 };
 
-static struct mc13783_buttons_platform_data moboard_buttons = {
+static struct mc13xxx_buttons_platform_data moboard_buttons = {
 	.b1on_flags = MC13783_BUTTON_DBNC_750MS | MC13783_BUTTON_ENABLE |
 			MC13783_BUTTON_POL_INVERT,
 	.b1on_key = KEY_POWER,
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs
  2011-09-26  6:50 [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs Uwe Kleine-König
@ 2011-09-26 10:05 ` Samuel Ortiz
  2011-09-26 11:52   ` Uwe Kleine-König
  0 siblings, 1 reply; 4+ messages in thread
From: Samuel Ortiz @ 2011-09-26 10:05 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Uwe,

On Mon, Sep 26, 2011 at 08:50:55AM +0200, Uwe Kleine-K?nig wrote:
> This is needed with patch
> 
> 	mfd: Remove mc13783 API functions and symbols
> 
> (currently cde41c030 in next)
Sorry, I missed this one.
Applied now, thanks a lot.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs
  2011-09-26 10:05 ` Samuel Ortiz
@ 2011-09-26 11:52   ` Uwe Kleine-König
  2011-09-29 15:56     ` Samuel Ortiz
  0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2011-09-26 11:52 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Samuel,

On Mon, Sep 26, 2011 at 12:05:11PM +0200, Samuel Ortiz wrote:
> On Mon, Sep 26, 2011 at 08:50:55AM +0200, Uwe Kleine-K?nig wrote:
> > This is needed with patch
> > 
> > 	mfd: Remove mc13783 API functions and symbols
> > 
> > (currently cde41c030 in next)
> Sorry, I missed this one.
> Applied now, thanks a lot.
It's me who missed it, isn't it?

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs
  2011-09-26 11:52   ` Uwe Kleine-König
@ 2011-09-29 15:56     ` Samuel Ortiz
  0 siblings, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2011-09-29 15:56 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Uwe,

On Mon, Sep 26, 2011 at 01:52:12PM +0200, Uwe Kleine-K?nig wrote:
> Hi Samuel,
> 
> On Mon, Sep 26, 2011 at 12:05:11PM +0200, Samuel Ortiz wrote:
> > On Mon, Sep 26, 2011 at 08:50:55AM +0200, Uwe Kleine-K?nig wrote:
> > > This is needed with patch
> > > 
> > > 	mfd: Remove mc13783 API functions and symbols
> > > 
> > > (currently cde41c030 in next)
> > Sorry, I missed this one.
> > Applied now, thanks a lot.
> It's me who missed it, isn't it?
And me who applied it without noticing, so I blame us :)

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-09-29 15:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26  6:50 [PATCH] ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs Uwe Kleine-König
2011-09-26 10:05 ` Samuel Ortiz
2011-09-26 11:52   ` Uwe Kleine-König
2011-09-29 15:56     ` Samuel Ortiz

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).