diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-02-05 16:26:35 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-03-01 14:58:46 -0500 |
| commit | cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934 (patch) | |
| tree | 6ead78509cec2f82eb682d8a0c1e6a3d9bb4be9d /drivers/ata | |
| parent | 96780078f35648050fef808f49a0ffff0360bb57 (diff) | |
| download | kernel_samsung_espresso10-cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934.zip kernel_samsung_espresso10-cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934.tar.gz kernel_samsung_espresso10-cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 950da39..b351d81 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -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; |