Commit cb6643e1 authored Feb 05, 2010 by Christoph Egger Committed by Jeff Garzik Mar 01, 2010

[libata] pata_marvell: CONFIG_AHCI is really CONFIG_SATA_AHCI



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>

parent 96780078

drivers/ata/pata_marvell.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;