---

yaml --- r: 179668 b: refs/heads/master c: c19bdb6 h: refs/heads/master v: v3
git-mirror · Jan 16, 2010 · ef4611f · ef4611f
1 parent c142984
commit ef4611f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97adf9e7bebf17a86b95e2131bf9ba76c4857c7
+refs/heads/master: c19bdb6126a5e1f43b4a4fc3c4b09c926667e5ef
diff --git a/trunk/drivers/acpi/sbs.c b/trunk/drivers/acpi/sbs.c
@@ -822,7 +822,10 @@ 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) || 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)