summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorYuanhan Liu <yuanhan.liu@linux.intel.com>2012-10-16 22:59:04 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-25 12:05:50 -0700
commit2cb55a2f47a3c695a0105b7fc04a3b70c3bc4e4f (patch)
treefdfc118b6d18c7da3bdd6a1ff20a99c6befa4399 /drivers/char
parent1392550240aaa72ce3a094a38bd23525cd67ce60 (diff)
downloadlinux-stable-2cb55a2f47a3c695a0105b7fc04a3b70c3bc4e4f.tar.gz
linux-stable-2cb55a2f47a3c695a0105b7fc04a3b70c3bc4e4f.tar.bz2
linux-stable-2cb55a2f47a3c695a0105b7fc04a3b70c3bc4e4f.zip
sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
This will fix warnings like following when CONFIG_PM_SLEEP is not set: warning: 'xxx_suspend' defined but not used [-Wunused-function] warning: 'xxx_resume' defined but not used [-Wunused-function] Because SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) Only references the callbacks on CONFIG_PM_SLEEP (instead of CONFIG_PM). Cc: Mattia Dongili <malattia@linux.it> Cc: Arnd Bergmann <arnd@arndb.de> Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/sonypi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 320debbe32fa..9b4f0116ff21 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1456,7 +1456,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int old_camera_power;
static int sonypi_suspend(struct device *dev)