summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2010-02-16 22:41:52 +0100
committerEric Miao <eric.y.miao@gmail.com>2010-03-02 07:40:52 +0800
commitcfab57e0e44631b1369e05efa54031b993511c2f (patch)
tree3c3ab1d889748c11bf212fba3fa5656c901deade /arch
parent1f3b536be7bfb3930cf7dc6d995d82877f25d6cf (diff)
downloadlinux-3.10-cfab57e0e44631b1369e05efa54031b993511c2f.tar.gz
linux-3.10-cfab57e0e44631b1369e05efa54031b993511c2f.tar.bz2
linux-3.10-cfab57e0e44631b1369e05efa54031b993511c2f.zip
[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.
This function gets only called from scoop_suspend() and scoop_resume() which are only built in if we have CONFIG_PM set. Make it the same for check_scoop_reg(). This fixes the following warning: arch/arm/common/scoop.c:143: warning: ‘check_scoop_reg’ defined but not used Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/common/scoop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 37bda5f3dde..9012004321d 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -140,6 +140,7 @@ EXPORT_SYMBOL(reset_scoop);
EXPORT_SYMBOL(read_scoop_reg);
EXPORT_SYMBOL(write_scoop_reg);
+#ifdef CONFIG_PM
static void check_scoop_reg(struct scoop_dev *sdev)
{
unsigned short mcr;
@@ -149,7 +150,6 @@ static void check_scoop_reg(struct scoop_dev *sdev)
iowrite16(0x0101, sdev->base + SCOOP_MCR);
}
-#ifdef CONFIG_PM
static int scoop_suspend(struct platform_device *dev, pm_message_t state)
{
struct scoop_dev *sdev = platform_get_drvdata(dev);