From fbe74a06c3a8cfc0b6e51e7fb5e2db62a9cfecc3 Mon Sep 17 00:00:00 2001
From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Tue, 16 Oct 2012 22:59:01 +0800
Subject: [PATCH] --- yaml --- r: 335807 b: refs/heads/master c:
 29448ec129c5c9c7ece2ef28c72a0dafd70c8af2 h: refs/heads/master i:   335805:
 daee29ce52922190cb3d27648ba7115213cc25b3   335803:
 18760ab70bdd3b93fe6af072333b6e34fbfe065d   335799:
 1f2f44160fd9fa5699ab073d45f62fa892481a75   335791:
 84589b2e8b0aa790274b3376651a24054841f1ab   335775:
 019321392db351be30de85821d022c7256fcb722   335743:
 953cdb39bffb49ffd16b858647acd15c601e8163 v: v3

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

diff --git a/[refs] b/[refs]
index 0ffc67e6e174..9cda75ca1bc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b03e66a6be91f8389fcd902ab6c1563db1c9c06b
+refs/heads/master: 29448ec129c5c9c7ece2ef28c72a0dafd70c8af2
diff --git a/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c
index b1ae48054dc5..b7078afddb74 100644
--- a/trunk/drivers/ata/ahci_platform.c
+++ b/trunk/drivers/ata/ahci_platform.c
@@ -238,7 +238,7 @@ static int __devexit ahci_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ahci_suspend(struct device *dev)
 {
 	struct ahci_platform_data *pdata = dev_get_platdata(dev);
diff --git a/trunk/drivers/ata/pata_arasan_cf.c b/trunk/drivers/ata/pata_arasan_cf.c
index 71111f214eab..371fd2c698b7 100644
--- a/trunk/drivers/ata/pata_arasan_cf.c
+++ b/trunk/drivers/ata/pata_arasan_cf.c
@@ -914,7 +914,7 @@ static int __devexit arasan_cf_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int arasan_cf_suspend(struct device *dev)
 {
 	struct ata_host *host = dev_get_drvdata(dev);
diff --git a/trunk/drivers/ata/sata_highbank.c b/trunk/drivers/ata/sata_highbank.c
index 36a141a2b22b..400bf1c3e982 100644
--- a/trunk/drivers/ata/sata_highbank.c
+++ b/trunk/drivers/ata/sata_highbank.c
@@ -378,7 +378,7 @@ static int __devexit ahci_highbank_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ahci_highbank_suspend(struct device *dev)
 {
 	struct ata_host *host = dev_get_drvdata(dev);