From 4b0c47d98cddfe1ae93bd05976f034092d13be05 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Tue, 16 Feb 2010 22:41:52 +0100
Subject: [PATCH] --- yaml --- r: 187457 b: refs/heads/master c:
 cfab57e0e44631b1369e05efa54031b993511c2f h: refs/heads/master i:   187455:
 d3e01d032d290798bfd2cc87ac1a3a0db25c3fe1 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/common/scoop.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3cd5cc9b13ef..e83b82e23a7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f3b536be7bfb3930cf7dc6d995d82877f25d6cf
+refs/heads/master: cfab57e0e44631b1369e05efa54031b993511c2f
diff --git a/trunk/arch/arm/common/scoop.c b/trunk/arch/arm/common/scoop.c
index 37bda5f3dde3..9012004321dd 100644
--- a/trunk/arch/arm/common/scoop.c
+++ b/trunk/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);