lkml.org 
[lkml]   [2007]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH] libata: CONFIG_PM=n compile fix
    From
    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);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-06-04 00:55    [W:0.019 / U:30.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site