The patch titled
pata_pcmcia: cable detect
has been removed from the -mm tree. Its filename was
pata_pcmcia-cable-detect.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
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
pcmcia-spot-slave-decode-flaws-for-testing.patch
pata_sl82c105-missing-methods-cable.patch
ata_piix-remove-ugly-layering-violation.patch
pata_pcmcia-cable-detect.patch
pata_triflex-cable-detect.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
