Jeff Garzik wrote:
> Please pull from 'upstream-linus' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
> upstream-linus
>
..
> Andrew Morton (1):
> git-libata-all: sata_via build fix
..
> diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
> index 939c924..d105d2c 100644
> --- a/drivers/ata/sata_via.c
> +++ b/drivers/ata/sata_via.c
> @@ -116,10 +116,6 @@ static struct scsi_host_template svia_sht = {
> .slave_configure = ata_scsi_slave_config,
> .slave_destroy = ata_scsi_slave_destroy,
> .bios_param = ata_std_bios_param,
> -#ifdef CONFIG_PM
> - .suspend = ata_scsi_device_suspend,
> - .resume = ata_scsi_device_resume,
> -#endif
> };
>
> static const struct ata_port_operations vt6420_sata_ops = {
> @@ -415,7 +411,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev,
> struct ata_host **r_host)
> struct ata_host *host;
> int rc;
>
> - rc = ata_pci_prepare_native_host(pdev, ppi, 2, &host);
> + rc = ata_pci_prepare_native_host(pdev, ppi, &host);
> if (rc)
> return rc;
> *r_host = host;
This, additionally to the obvious build fix, again removes the suspend support.
Is this intended?
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
