| Message ID | 1317019855-10215-1-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
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.
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
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.
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,
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(-)