From: Shuah Khan <shuah.kh@samsung.com>
To: lenb@kernel.org, rjw@rjwysocki.net, rui.zhang@intel.com
Cc: Shuah Khan <shuah.kh@samsung.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org, shuahkhan@gmail.com
Subject: [PATCH 6/6] drivers/acpi: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
Date: Wed, 12 Feb 2014 20:19:10 -0700 [thread overview]
Message-ID: <cf2b092c9e1fcb1ea56d56284745836df45c9c79.1392250669.git.shuah.kh@samsung.com> (raw)
In-Reply-To: <cover.1392250669.git.shuah.kh@samsung.com>
In-Reply-To: <cover.1392250669.git.shuah.kh@samsung.com>
thermal driver defines acpi_thermal_resume() when CONFIG_PM_SLEEP is defined.
This results in the following compile error when CONFIG_PM_SLEEP is undefined.
CC drivers/acpi/thermal.o
drivers/acpi/thermal.c:107:8: error: ‘acpi_thermal_resume’ undeclared here (not in a function)
make[2]: *** [drivers/acpi/thermal.o] Error 1
Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
---
drivers/acpi/thermal.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 8349a55..08626c8 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -102,6 +102,8 @@ MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_thermal_resume(struct device *dev);
+#else
+#define acpi_thermal_resume NULL
#endif
static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);
--
1.7.10.4
next prev parent reply other threads:[~2014-02-13 3:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-13 3:19 [PATCH 0/6] drivers/acpi: fix driver compile errors when CONFIG_PM_SLEEP is undefined Shuah Khan
2014-02-13 3:19 ` [PATCH 1/6] drivers/acpi: fix ac driver compile error " Shuah Khan
2014-02-13 3:19 ` [PATCH 2/6] drivers/acpi: fix battery " Shuah Khan
2014-02-13 3:19 ` [PATCH 3/6] drivers/acpi: fix button " Shuah Khan
2014-02-13 3:19 ` [PATCH 4/6] drivers/acpi: fix fan " Shuah Khan
2014-02-13 3:19 ` [PATCH 5/6] drivers/acpi: fix sbs " Shuah Khan
2014-02-13 3:19 ` Shuah Khan [this message]
2014-02-18 1:03 ` [PATCH 0/6] drivers/acpi: fix driver compile errors " Rafael J. Wysocki
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=cf2b092c9e1fcb1ea56d56284745836df45c9c79.1392250669.git.shuah.kh@samsung.com \
--to=shuah.kh@samsung.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=shuahkhan@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).