[libata] pata_marvell: CONFIG_AHCI is really CONFIG_SATA_AHCI
authorChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Fri, 5 Feb 2010 15:26:35 +0000 (16:26 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Mon, 1 Mar 2010 19:58:46 +0000 (14:58 -0500)
The marvell driver comtains a fallback to ahci for the sata ports
which is incorrectly checked as CONFIG_AHCI while the only AHCI config
item is actually called SATA_AHCI (which also sounds sensible
considering it's a fallback for the sata ports).

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/pata_marvell.c

index 950da39cae3ded0403eac242107ce5b94999417c..b351d81813f3d43e79ef89e031f1fa7286efa8be 100644 (file)
@@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
        if (pdev->device == 0x6101)
                ppi[1] = &ata_dummy_port_info;
 
-#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
+#if defined(CONFIG_SATA_AHCI) || defined(CONFIG_SATA_AHCI_MODULE)
        if (!marvell_pata_active(pdev)) {
                printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
                return -ENODEV;