]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ahci.c: fix CONFIG_PM=n compilation
authorAlexey Dobriyan <adobriyan@gmail.com>
Tue, 17 Jul 2007 19:48:48 +0000 (23:48 +0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 20 Jul 2007 11:16:24 +0000 (07:16 -0400)
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>
drivers/ata/ahci.c

index 11e4eb9f304e92bd97498313c6600a3e7dceffe8..eaec5e506f5ed2d3600d9dd1e46186b2513ef7ae 100644 (file)
@@ -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);