[merged] acpi-fix-unused-variable-warning-in-sbsc.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     acpi: fix unused variable warning in sbs.c
has been removed from the -mm tree.  Its filename was
     acpi-fix-unused-variable-warning-in-sbsc.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: acpi: fix unused variable warning in sbs.c
From: Rakib Mullick <rakib.mullick@xxxxxxxxx>

When CONFIG_ACPI_SYSFS_POWER=n and CONFIG_ACPI_PROCFS_POWER=n, then
we're warned by the following warning:

drivers/acpi/sbs.c: In function `acpi_battery_remove':
drivers/acpi/sbs.c:825: warning: unused variable `battery'

Signed-off-by: Rakib Mullick <rakib.mullick@xxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/acpi/sbs.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/acpi/sbs.c~acpi-fix-unused-variable-warning-in-sbsc drivers/acpi/sbs.c
--- a/drivers/acpi/sbs.c~acpi-fix-unused-variable-warning-in-sbsc
+++ a/drivers/acpi/sbs.c
@@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_
 
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
+#if defined(CONFIG_ACPI_SYSFS_POWER) || defined(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)
_

Patches currently in -mm which might be from rakib.mullick@xxxxxxxxx are

origin.patch
linux-next.patch
smp-fix-documentation-in-include-linux-smph.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux