Re: [PATCH] power/ds2760_battery: Add rated capacity of the hx47003600mAh battery

[Philipp Zabel]

On Wed, Nov 23, 2011 at 11:37 PM, Paul Parsons <lost.distance@xxxxxxxxx> wrote:
> Add rated capacity of the HP iPAQ hx4700 3.7V 3600mAh (359114-001) battery.
> For this battery the value of the rated capacity EEPROM register at 0x32 is 14;
> thus rated_capacities[14] = 3600.
>
> Signed-off-by: Paul Parsons <lost.distance@xxxxxxxxx>
> ---
> diff -uprN clean-3.2-rc2/drivers/power/ds2760_battery.c linux-3.2-rc2/drivers/power/ds2760_battery.c
> --- clean-3.2-rc2/drivers/power/ds2760_battery.c        2011-11-15 17:02:59.000000000 +0000
> +++ linux-3.2-rc2/drivers/power/ds2760_battery.c        2011-11-23 22:06:46.816841888 +0000
> @@ -95,7 +95,11 @@ static int rated_capacities[] = {
>        2880,   /* Samsung */
>        2880,   /* BYD */
>        2880,   /* Lishen */
> -       2880    /* NEC */
> +       2880,   /* NEC */
> +#ifdef CONFIG_MACH_H4700
> +       0,
> +       3600,   /* HP iPAQ hx4700 3.7V 3600mAh (359114-001) */
> +#endif

Is that #ifdef needed? I know there's another one a few lines up, but
I think that one is already unfortunate and there is no conflict here.

regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/