summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-09-25 20:39:46 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-25 19:40:12 +0200
commit11fa8da5fb14b23ff796c09d61a162a27deeb04f (patch)
tree27b62208004a18c6ae879b2589224c038058fdcb /drivers/platform
parentcc8ef52707341e67a12067d6ead991d56ea017ca (diff)
downloadblackbird-obmc-linux-11fa8da5fb14b23ff796c09d61a162a27deeb04f.tar.gz
blackbird-obmc-linux-11fa8da5fb14b23ff796c09d61a162a27deeb04f.zip
ideapad_laptop: introduce #ifdef CONFIG_PM_SLEEP for PM specific code
ideapad_acpi_resume() and ideapad_pm is meaningful only if CONFIG_PM_SLEEP is set. Thus introduce #ifdef for this piece of code. Signed-off-by: Zhang Rui <rui.zhang@intel.com> CC: Matthew Garrett <matthew.garrett@nebula.com> CC: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/ideapad-laptop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 89c4519d48ac..5021c55210e8 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -901,6 +901,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
}
}
+#ifdef CONFIG_PM_SLEEP
static int ideapad_acpi_resume(struct device *device)
{
ideapad_sync_rfk_state(ideapad_priv);
@@ -909,6 +910,7 @@ static int ideapad_acpi_resume(struct device *device)
}
static SIMPLE_DEV_PM_OPS(ideapad_pm, NULL, ideapad_acpi_resume);
+#endif
static struct acpi_driver ideapad_acpi_driver = {
.name = "ideapad_acpi",
@@ -917,7 +919,9 @@ static struct acpi_driver ideapad_acpi_driver = {
.ops.add = ideapad_acpi_add,
.ops.remove = ideapad_acpi_remove,
.ops.notify = ideapad_acpi_notify,
+#ifdef CONFIG_PM_SLEEP
.drv.pm = &ideapad_pm,
+#endif
.owner = THIS_MODULE,
};
module_acpi_driver(ideapad_acpi_driver);
OpenPOWER on IntegriCloud