---

yaml --- r: 300023 b: refs/heads/master c: fb9751d h: refs/heads/master i: 300021: 14540fb 300019: c738347 300015: 39bae66 v: v3
git-mirror · May 3, 2012 · b296131 · b296131
1 parent 4d44662
commit b296131
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -943,19 +943,17 @@ 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,
 	.remove		= __devexit_p(arasan_cf_remove),
 	.driver		= {
 		.name	= DRIVER_NAME,
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &arasan_cf_pm_ops,
-#endif
 	},
 };