aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2007-07-17 15:48:48 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-20 07:16:24 -0400
commit028a2596336b19a7e3713cfa9fe04d0d32e95876 (patch)
tree879f9f0127a7caff7857f38593a93d344b73763e /drivers
parent3fb6589ceaf06d9c65bdf2382249d818771e913b (diff)
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')
-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)
1519 } 1519 }
1520} 1520}
1521 1521
1522static int ahci_port_resume(struct ata_port *ap)
1523{
1524 ahci_power_up(ap);
1525 ahci_start_port(ap);
1526
1527 return 0;
1528}
1529
1522#ifdef CONFIG_PM 1530#ifdef CONFIG_PM
1523static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg) 1531static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
1524{ 1532{
@@ -1536,14 +1544,6 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
1536 return rc; 1544 return rc;
1537} 1545}
1538 1546
1539static int ahci_port_resume(struct ata_port *ap)
1540{
1541 ahci_power_up(ap);
1542 ahci_start_port(ap);
1543
1544 return 0;
1545}
1546
1547static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) 1547static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
1548{ 1548{
1549 struct ata_host *host = dev_get_drvdata(&pdev->dev); 1549 struct ata_host *host = dev_get_drvdata(&pdev->dev);