From fa3b69eebeea18b42ffeb2df30be6e78dc4bb93b Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 5 Feb 2010 16:26:35 +0100 Subject: [PATCH] --- yaml --- r: 183177 b: refs/heads/master c: cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934 h: refs/heads/master i: 183175: 2ebe904e48972c91a96835ac3b999ceae87d49b8 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_marvell.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7718ce226f0c..289d73aea8ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96780078f35648050fef808f49a0ffff0360bb57 +refs/heads/master: cb6643e1c38b6bd5c1594f0a45d8cf6943a6f934 diff --git a/trunk/drivers/ata/pata_marvell.c b/trunk/drivers/ata/pata_marvell.c index 950da39cae3d..b351d81813f3 100644 --- a/trunk/drivers/ata/pata_marvell.c +++ b/trunk/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;