[alsa-devel] [PATCH 4/4] Convert all platforms to pass platform_data to wm97xx battery

[Robert Jarzmik]

Marek Vasut <marek.vasut at gmail.com> writes:

> Dne St 22. července 2009 13:01:03 Marek Vasut napsal(a):
>> Ok,
>> Im sending the set again.
> And this does the platform conversion. Depends on 3/4 and should be Acked by 
> Robert. So please.
Well, there are 2 things wrong with the mioa701 part.

> diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
> index 3cab452..803917d 100644
> --- a/arch/arm/mach-pxa/mioa701.c
> +++ b/arch/arm/mach-pxa/mioa701.c
> @@ -34,7 +34,7 @@
>  #include <linux/irq.h>
>  #include <linux/pda_power.h>
>  #include <linux/power_supply.h>
> -#include <linux/wm97xx_batt.h>
> +#include <linux/wm97xx.h>
>  #include <linux/mtd/physmap.h>
>  #include <linux/usb/gpio_vbus.h>
>  #include <linux/regulator/max1586.h>
> @@ -660,6 +660,10 @@ static struct wm97xx_batt_info mioa701_battery_data = {
(1)                                    \-> should be wm97xx_batt_pdata

(2) remove wm97xx_bat_set_pdata(&mioa701_battery_data) call in
mioa701_machine_init().

I'll try to test this evening, and report.

Cheers.

--
Robert