summaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci.c
diff options
context:
space:
mode:
authorAlexey Dobriyan2007-07-17 21:48:48 +0200
committerJeff Garzik2007-07-20 13:16:24 +0200
commit028a2596336b19a7e3713cfa9fe04d0d32e95876 (patch)
tree879f9f0127a7caff7857f38593a93d344b73763e /drivers/ata/ahci.c
parentlibata: add ST9160821AS 3.CLF to NONCQ blacklist (diff)
downloadkernel-qcow2-linux-028a2596336b19a7e3713cfa9fe04d0d32e95876.tar.gz
kernel-qcow2-linux-028a2596336b19a7e3713cfa9fe04d0d32e95876.tar.xz
kernel-qcow2-linux-028a2596336b19a7e3713cfa9fe04d0d32e95876.zip
ahci.c: fix CONFIG_PM=n compilation
Commit df69c9c5438b4e396a64d42608b2a6c48a3e7475 moved only prototype of out of CONFIG_PM. Move function out as well. Box seems to boot fine. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r--drivers/ata/ahci.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 11e4eb9f304e..eaec5e506f5e 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1519,6 +1519,14 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)
}
}
+static int ahci_port_resume(struct ata_port *ap)
+{
+ ahci_power_up(ap);
+ ahci_start_port(ap);
+
+ return 0;
+}
+
#ifdef CONFIG_PM
static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
{
@@ -1536,14 +1544,6 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
return rc;
}
-static int ahci_port_resume(struct ata_port *ap)
-{
- ahci_power_up(ap);
- ahci_start_port(ap);
-
- return 0;
-}
-
static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);