From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] pata_mpiix: Cable detect method Date: Fri, 09 Mar 2007 07:25:43 -0500 Message-ID: <45F15247.3060802@pobox.com> References: <20070307162105.53c3bcab@lxorguk.ukuu.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:55417 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422628AbXCIMZp (ORCPT ); Fri, 9 Mar 2007 07:25:45 -0500 In-Reply-To: <20070307162105.53c3bcab@lxorguk.ukuu.org.uk> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Alan Cox Cc: akpm@osdl.org, linux-ide@vger.kernel.org Alan Cox wrote: > Signed-off-by: Alan Cox > > diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_mpiix.c linux-2.6.21-rc2-mm2/drivers/ata/pata_mpiix.c > --- linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_mpiix.c 2007-03-06 23:09:46.000000000 +0000 > +++ linux-2.6.21-rc2-mm2/drivers/ata/pata_mpiix.c 2007-03-06 23:35:28.000000000 +0000 > @@ -35,7 +35,7 @@ > #include > > #define DRV_NAME "pata_mpiix" > -#define DRV_VERSION "0.7.5" > +#define DRV_VERSION "0.7.6" > > enum { > IDETIM = 0x6C, /* IDE control register */ > @@ -53,7 +53,6 @@ > > if (!pci_test_config_bits(pdev, &mpiix_enable_bits)) > return -ENOENT; > - ap->cbl = ATA_CBL_PATA40; > return ata_std_prereset(ap); > } > > @@ -185,6 +184,7 @@ > .thaw = ata_bmdma_thaw, > .error_handler = mpiix_error_handler, > .post_internal_cmd = ata_bmdma_post_internal_cmd, > + .cable_detect = ata_cable_40wire, > > .qc_prep = ata_qc_prep, > .qc_issue = mpiix_qc_issue_prot, applied, as part of a jumbo ->cable_detect patch, since this patch contained changes highly similar to others it was applied alongside.