From patchwork Fri Feb 5 15:26:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 44647 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7E87FB7CBD for ; Sat, 6 Feb 2010 02:26:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933077Ab0BEP0Z (ORCPT ); Fri, 5 Feb 2010 10:26:25 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:63559 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932766Ab0BEP0Y (ORCPT ); Fri, 5 Feb 2010 10:26:24 -0500 Received: from faui49h (faui49h.informatik.uni-erlangen.de [131.188.42.58]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 4B28B5F0CE; Fri, 5 Feb 2010 16:26:19 +0100 (MET) Received: by faui49h (sSMTP sendmail emulation); Fri, 05 Feb 2010 16:26:35 +0100 Date: Fri, 5 Feb 2010 16:26:35 +0100 From: Christoph Egger To: Frans Pop Cc: jgarzik@pobox.com, knan-lkml@anduin.net, bzolnier@gmail.com, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, vamos@i4.informatik.uni-erlangen.de, alan@lxorguk.ukuu.org.uk Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI) Message-ID: <20100205152635.GC7299@faui49.informatik.uni-erlangen.de> References: <20100205132959.GB6874@faui49.informatik.uni-erlangen.de> <201002051457.04135.elendil@planet.nl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201002051457.04135.elendil@planet.nl> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On Fri, Feb 05, 2010 at 02:57:00PM +0100, Frans Pop wrote: > Christoph Egger wrote: > > --- 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, > > if (pdev->device == 0x6101) > > ppi[1] = &ata_dummy_port_info; > > > > -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE) > > +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE) > > Shouldn't the last be CONFIG_SATA_AHCI_MODULE ? Right my fault. Updated patch below ----- From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 5 Feb 2010 13:26:33 +0100 Subject: [PATCH] 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 --- 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..eabd138 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;