The patch titled pata_pcmcia: cable detect has been added to the -mm tree. Its filename is pata_pcmcia-cable-detect.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pata_pcmcia: cable detect From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> This one is a bit odd. Most PCMCIA adapters don't really have a "cable" but have the controller embedded in the CF adapter or similar. Some real IDE adapters do exist although they are rare. As PCMCIA is ISA timing it can only support PIO0 so reporting 40 wire seems closest to the truth and I don't see the need for a 'ATA_CBL_HARDWIRED' type although we could add one if Jeff wanted. (As a PS Jeff - if you don't want to merge the code for spotting missing slave detect for 2.6.21 it would be best to remove the SLAVE flag from that driver for 2.6.21 and just probe master only - safer and will break only ultra-obscure setups) Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/pata_pcmcia.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/ata/pata_pcmcia.c~pata_pcmcia-cable-detect drivers/ata/pata_pcmcia.c --- a/drivers/ata/pata_pcmcia.c~pata_pcmcia-cable-detect +++ a/drivers/ata/pata_pcmcia.c @@ -42,7 +42,7 @@ #define DRV_NAME "pata_pcmcia" -#define DRV_VERSION "0.3.0" +#define DRV_VERSION "0.3.1" /* * Private data structure to glue stuff together @@ -118,6 +118,7 @@ static struct ata_port_operations pcmcia .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_40wire, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, _ 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 acpi-driver-support-for-pata.patch pcmcia-spot-slave-decode-flaws-for-testing.patch pata_platform-set-a-cable-type-which-to-set.patch pata_qdi-set-cable-type.patch pata_sl82c105-missing-methods-cable.patch ata_generic-remove-lots-of-code-using-the-new-cable_detect.patch pata_ali-remove-lots-of-code-by-using-the-cable_detect.patch pata_cs55x0-clean-up-by-using-the-cable_detect-method.patch pata_cypress-clean-up-by-using-cable_detect-method.patch pata_isapnp-set-cable-type.patch pata_ixp4xx_cf-set-cable-type.patch pata_legacy-fix-missing-methods-and-add-cable-types.patch pata_netcell-remove-lots-of-crud-by-using-the-cable-method.patch pata_radisys-switch-to-cable-method-to-cleanup-code.patch pata_sc1200-set-cable-type-add-freeze-thaw-methods.patch pata_rz1000-remove-lots-of-crap-by-using-cable-method.patch pata_winbond-set-cable-type.patch pata_cmd64x-various-fixes.patch pata_hpt3x3-clean-up-by-using-cable-method.patch ata_piix-remove-ugly-layering-violation.patch pata_artop-cable-detect-methods.patch pata_cs5535-cable-detect.patch pata_hpt3x2n-cable-detect-handling-needs-work.patch pata_it821x-clean-up-by-using-cable-methods.patch pata_mpc52xx-cable-detect.patch pata_mpiix-cable-detect-method.patch pata_ns87410-cable-detect-method.patch pata_oldpiix-cable-detect.patch pata_opti-cable-detect.patch pata_pcmcia-cable-detect.patch pata_pdc202xx_old-cable-detect-clean-up.patch pata_sil680-cable-detect.patch pata_triflex-cable-detect.patch sata_via-cable-detection.patch pata_cmd640-multiple-updates.patch pata_efar-switch-to-cable_detect-method.patch pata_it8213-cable-detect.patch pata_marvell-cable-and-reset-fixes.patch pata_serverworks-cable-detect-and-comment-fix.patch pata_sis-clean-up-using-cable_detect-methods.patch pata_via-use-cable_detect-method.patch pata_hpt366-cable-detect-methods.patch pata_atiixp-switch-to-cable_detect-method-with-correct.patch libata-fix-hopefully-all-the-remaining-problems-with.patch resend-iphase-64bit-cleanup.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 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