From b296131d854d55ced34c87a6206363c47c28d3a6 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.linux@gmail.com>
Date: Sat, 21 Apr 2012 17:40:09 +0530
Subject: [PATCH] --- yaml --- r: 300023 b: refs/heads/master c:
 fb9751d471977be402efa1ee5885a17af78cbc55 h: refs/heads/master i:   300021:
 14540fb8814840cc683625fda04e64f11deb26aa   300019:
 c7383477721984aad3174f146dacdeac11f86b9c   300015:
 39bae6627d3e5854d98c47b8ff54ad85f50dcb44 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/ata/pata_arasan_cf.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d52e92af84e6..0e141491d104 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a78f57af610ea20559e6c63d90876bc262fdbf37
+refs/heads/master: fb9751d471977be402efa1ee5885a17af78cbc55
diff --git a/trunk/drivers/ata/pata_arasan_cf.c b/trunk/drivers/ata/pata_arasan_cf.c
index fc2db2a89a6b..3239517f4d90 100644
--- a/trunk/drivers/ata/pata_arasan_cf.c
+++ b/trunk/drivers/ata/pata_arasan_cf.c
@@ -943,9 +943,9 @@ static int arasan_cf_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume);
-#endif
 
 static struct platform_driver arasan_cf_driver = {
 	.probe		= arasan_cf_probe,
@@ -953,9 +953,7 @@ static struct platform_driver arasan_cf_driver = {
 	.driver		= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &arasan_cf_pm_ops,
-#endif
 	},
 };