From: Randy Dunlap <randy.dunlap@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org,
Alexey Starikovskiy <astarikovskiy@suse.de>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
Len Brown <lenb@kernel.org>
Subject: [PATCH -mmotm] acpi/sbs: fix build for ACPI_SYSFS_POWER=n
Date: Fri, 05 Mar 2010 11:54:17 -0800 [thread overview]
Message-ID: <4B916169.5040303@oracle.com> (raw)
In-Reply-To: <201003050232.o252WD4K011798@imap1.linux-foundation.org>
From: Randy Dunlap <randy.dunlap@oracle.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@oracle.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)
next prev parent reply other threads:[~2010-03-05 19:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-05 2:06 mmotm 2010-03-04-18-05 uploaded akpm
2010-03-05 19:54 ` Randy Dunlap [this message]
2010-03-05 20:37 ` [PATCH -mmotm] acpi/sbs: fix build for ACPI_SYSFS_POWER=n Alexey Starikovskiy
2010-03-09 6:21 ` Rakib Mullick
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B916169.5040303@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=astarikovskiy@suse.de \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome