The patch titled
pata_marvell: merge Mandriva patches
has been added to the -mm tree. Its filename is
pata_marvell-merge-mandriva-patches.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pata_marvell: merge Mandriva patches
From: Arnaud Patard <[EMAIL PROTECTED]>
Correct and complete the Marvell PATA cable detection logic.
Signed-off-by: Arnaud Patard <[EMAIL PROTECTED]>
Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/ata/pata_marvell.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/ata/pata_marvell.c~pata_marvell-merge-mandriva-patches
drivers/ata/pata_marvell.c
--- a/drivers/ata/pata_marvell.c~pata_marvell-merge-mandriva-patches
+++ a/drivers/ata/pata_marvell.c
@@ -57,11 +57,11 @@ static int marvell_pre_reset(struct ata_
switch(ap->port_no)
{
case 0:
- /* Might be backward, docs unclear */
if (inb(ap->ioaddr.bmdma_addr + 1) & 1)
- ap->cbl = ATA_CBL_PATA80;
- else
ap->cbl = ATA_CBL_PATA40;
+ else
+ ap->cbl = ATA_CBL_PATA80;
+ break;
case 1: /* Legacy SATA port */
ap->cbl = ATA_CBL_SATA;
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
pata_marvell-merge-mandriva-patches.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
