The patch titled pata_sl82c105: Missing methods, cable has been removed from the -mm tree. Its filename was pata_sl82c105-missing-methods-cable.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: pata_sl82c105: Missing methods, cable From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Missing freeze, thaw, post_internal methods, also switch to new cable method in passing. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/pata_sl82c105.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ata/pata_sl82c105.c~pata_sl82c105-missing-methods-cable drivers/ata/pata_sl82c105.c --- a/drivers/ata/pata_sl82c105.c~pata_sl82c105-missing-methods-cable +++ a/drivers/ata/pata_sl82c105.c @@ -59,7 +59,6 @@ static int sl82c105_pre_reset(struct ata if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) return -ENOENT; - ap->cbl = ATA_CBL_PATA40; return ata_std_prereset(ap, deadline); } @@ -239,6 +238,7 @@ static struct ata_port_operations sl82c1 .thaw = ata_bmdma_thaw, .error_handler = sl82c105_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_40wire, .bmdma_setup = ata_bmdma_setup, .bmdma_start = sl82c105_bmdma_start, _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are git-libata-all.patch expose-set_mode-method-so-it-can-be-wrapped.patch pcmcia-spot-slave-decode-flaws-for-testing.patch pata_sl82c105-missing-methods-cable.patch ata_piix-remove-ugly-layering-violation.patch pata_cmd640-multiple-updates.patch libata-fix-hopefully-all-the-remaining-problems-with.patch dilnetpc-fix-warning.patch resend-iphase-64bit-cleanup.patch serial-suppress-rts-assertion-with-disabled-crtscts.patch drivers-scsi-ncr5380c-replacing-yield-with-a.patch drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch x86_64-do-not-enable-the-nmi-watchdog-by-default.patch z85230-fix-fifo-handling.patch driver_bfin_serial_core.patch driver_bfin_serial_core-update.patch documentation-ask-driver-writers-to-provide-pm-support.patch tty-clarify-documentation-of-write.patch edac-new-opteron-athlon64-memory-controller-driver.patch edac-k8-driver-coding-tidy.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