[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B916169.5040303@oracle.com>
Date: Fri, 05 Mar 2010 11:54:17 -0800
From: Randy Dunlap <randy.dunlap@...cle.com>
To: linux-kernel@...r.kernel.org
CC: akpm@...ux-foundation.org,
Alexey Starikovskiy <astarikovskiy@...e.de>,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Len Brown <lenb@...nel.org>
Subject: [PATCH -mmotm] acpi/sbs: fix build for ACPI_SYSFS_POWER=n
From: Randy Dunlap <randy.dunlap@...cle.com>
When CONFIG_ACPI_SYSFS_POWER is not enabled:
drivers/acpi/sbs.c:640: error: implicit declaration of function 'acpi_battery_get_alarm'
drivers/acpi/sbs.c:679: error: implicit declaration of function 'acpi_battery_set_alarm'
so move those functions outside of the ifdef/endif block for that
config option.
Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
---
drivers/acpi/sbs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- mmotm-2010-0304-1805.orig/drivers/acpi/sbs.c
+++ mmotm-2010-0304-1805/drivers/acpi/sbs.c
@@ -412,8 +412,6 @@ static int acpi_ac_get_present(struct ac
return result;
}
-#ifdef CONFIG_ACPI_SYSFS_POWER
-
static int acpi_battery_get_alarm(struct acpi_battery *battery)
{
return acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
@@ -450,6 +448,8 @@ static int acpi_battery_set_alarm(struct
return ret;
}
+#ifdef CONFIG_ACPI_SYSFS_POWER
+
static ssize_t acpi_battery_alarm_show(struct device *dev,
struct device_attribute *attr,
char *buf)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists