Resend of the patch to remove the following warning: drivers/acpi/sbs.c: In function 'acpi_battery_remove': drivers/acpi/sbs.c:819: warning: unused variable 'battery' Signed-off-by:- "Manish Katiyar" <mkatiyar@xxxxxxxxx> --- drivers/acpi/sbs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 10a3651..8493603 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -816,7 +816,9 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) static void acpi_battery_remove(struct acpi_sbs *sbs, int id) { +#if defined (CONFIG_ACPI_SYSFS_POWER) || (CONFIG_ACPI_PROCFS_POWER) struct acpi_battery *battery = &sbs->battery[id]; +#endif #ifdef CONFIG_ACPI_SYSFS_POWER if (battery->bat.dev) { if (battery->have_sysfs_alarm) -- 1.5.4.3 Thanks - Manish On Sun, Aug 3, 2008 at 6:00 PM, Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx> wrote: > On Sun, 3 Aug 2008, Manish Katiyar wrote: > >> Below patch removes the following warning: >> drivers/acpi/sbs.c: In function 'acpi_battery_remove': >> drivers/acpi/sbs.c:819: warning: unused variable 'battery' >> >> >> >> Signed-off-by:- "Manish Katiyar" <mkatiyar@xxxxxxxxx> >> >> --- >> drivers/acpi/sbs.c | 2 ++ >> 1 files changed, 2 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c >> index 10a3651..8493603 100644 >> --- a/drivers/acpi/sbs.c >> +++ b/drivers/acpi/sbs.c >> @@ -816,7 +816,9 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) >> >> static void acpi_battery_remove(struct acpi_sbs *sbs, int id) >> { >> +#ifdef CONFIG_ACPI_SYSFS_POWER || CONFIG_ACPI_PROCFS_POWER > > I don't think you can use || operator in ifdef like that... ...Try > #if defined(...) || (...) instead. > > > -- > i. > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html