The patch titled
pata_oldpiix: restore cable method, re-correct comments
has been removed from the -mm tree. Its filename was
pata_oldpiix-restore-cable-method-re-correct-comments.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: pata_oldpiix: restore cable method, re-correct comments
From: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/pata_oldpiix.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/ata/pata_oldpiix.c~pata_oldpiix-restore-cable-method-re-correct-comments drivers/ata/pata_oldpiix.c
--- a/drivers/ata/pata_oldpiix.c~pata_oldpiix-restore-cable-method-re-correct-comments
+++ a/drivers/ata/pata_oldpiix.c
@@ -25,7 +25,7 @@
#include <linux/ata.h>
#define DRV_NAME "pata_oldpiix"
-#define DRV_VERSION "0.5.4"
+#define DRV_VERSION "0.5.9"
/**
* oldpiix_pre_reset - probe begin
@@ -45,7 +45,6 @@ static int oldpiix_pre_reset(struct ata_
if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
return -ENOENT;
- ap->cbl = ATA_CBL_PATA40;
return ata_std_prereset(ap, deadline);
}
@@ -66,7 +65,7 @@ static void oldpiix_pata_error_handler(s
/**
* oldpiix_set_piomode - Initialize host controller PATA PIO timings
* @ap: Port whose timings we are configuring
- * @adev: um
+ * @adev: Device whose timings we are configuring
*
* Set PIO mode for device, in host controller PCI config space.
*
@@ -256,6 +255,7 @@ static const struct ata_port_operations
.thaw = ata_bmdma_thaw,
.error_handler = oldpiix_pata_error_handler,
.post_internal_cmd = ata_bmdma_post_internal_cmd,
+ .cable_detect = ata_cable_40wire,
.bmdma_setup = ata_bmdma_setup,
.bmdma_start = ata_bmdma_start,
_
Patches currently in -mm which might be from alan@xxxxxxxxxx are
origin.patch
git-libata-all.patch
pcmcia-spot-slave-decode-flaws-for-testing.patch
ata_generic-remove-all-the-crud-again-and-use-cable.patch
pata_ali-remove-all-the-crap-again-and-switch-to.patch
pata_amd-remove-all-the-crud-and-restore-the-cable-detect.patch
pata_cs5535-re-remove-all-the-crap-and-switch-to-the-cable.patch
pata_cypress-re-remove-all-the-crap-and-switch-back-to.patch
pata_netcell-re-remove-all-the-crud.patch
pata_qdi-restore-cable-detect.patch
pata_sl82c105-restore-cable-detect-method.patch
pata_winbond-restore-cable-method.patch
libata-acpi-add-infrastructure-for-drivers-to-use.patch
pata_optidma-rework-for-cable-detect-and-to-remove.patch
pata_pdc2027x-restore-various-updates-done-on-the-driver.patch
pata_acpi-restore-driver.patch
resend-iphase-64bit-cleanup.patch
pci_module_init-convertion-in-tmscsimc.patch
tty-clarify-documentation-of-write.patch
tty-i386-x86_64-arbitary-speed-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
