diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2010-02-16 16:41:52 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-03-01 18:40:52 -0500 |
commit | cfab57e0e44631b1369e05efa54031b993511c2f (patch) | |
tree | 3c3ab1d889748c11bf212fba3fa5656c901deade /arch/arm/common | |
parent | 1f3b536be7bfb3930cf7dc6d995d82877f25d6cf (diff) |
[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/arm/common')
-rw-r--r-- | arch/arm/common/scoop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 37bda5f3dde3..9012004321dd 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
@@ -140,6 +140,7 @@ EXPORT_SYMBOL(reset_scoop); | |||
140 | EXPORT_SYMBOL(read_scoop_reg); | 140 | EXPORT_SYMBOL(read_scoop_reg); |
141 | EXPORT_SYMBOL(write_scoop_reg); | 141 | EXPORT_SYMBOL(write_scoop_reg); |
142 | 142 | ||
143 | #ifdef CONFIG_PM | ||
143 | static void check_scoop_reg(struct scoop_dev *sdev) | 144 | static void check_scoop_reg(struct scoop_dev *sdev) |
144 | { | 145 | { |
145 | unsigned short mcr; | 146 | unsigned short mcr; |
@@ -149,7 +150,6 @@ static void check_scoop_reg(struct scoop_dev *sdev) | |||
149 | iowrite16(0x0101, sdev->base + SCOOP_MCR); | 150 | iowrite16(0x0101, sdev->base + SCOOP_MCR); |
150 | } | 151 | } |
151 | 152 | ||
152 | #ifdef CONFIG_PM | ||
153 | static int scoop_suspend(struct platform_device *dev, pm_message_t state) | 153 | static int scoop_suspend(struct platform_device *dev, pm_message_t state) |
154 | { | 154 | { |
155 | struct scoop_dev *sdev = platform_get_drvdata(dev); | 155 | struct scoop_dev *sdev = platform_get_drvdata(dev); |