From: olof@lixom.net (Olof Johansson)
To: Jeff Garzik <jeff@garzik.org>
Cc: linux-ide@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: [PATCH] libata: CONFIG_PM=n compile fix
Date: Sun, 3 Jun 2007 17:58:40 -0500 [thread overview]
Message-ID: <20070603225840.GA25465@lixom.net> (raw)
In-Reply-To: <20070527030954.GA18974@havoc.gtf.org>
CONFIG_PM=n compile fix.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
Hi,
On Sat, May 26, 2007 at 11:09:54PM -0400, Jeff Garzik wrote:
> This is checked into the 'mv-ahci-pata' branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
Didn't build for me without this change, since I had CONFIG_PM=n.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 21df81e..07d5a95 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1818,6 +1836,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)
{
@@ -1835,14 +1861,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);
next prev parent reply other threads:[~2007-06-03 22:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-27 3:09 [PATCH] Add Marvell 6141 PATA support to AHCI driver Jeff Garzik
2007-05-27 12:18 ` Alan Cox
2007-05-28 19:24 ` George T. Joseph (development)
2007-07-07 15:29 ` Jeff Garzik
2007-06-03 22:58 ` Olof Johansson [this message]
2007-06-04 1:38 ` [PATCH] libata: CONFIG_PM=n compile fix Nigel Cunningham
2007-07-03 14:16 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070603225840.GA25465@lixom.net \
--to=olof@lixom.net \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jeff@garzik.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.