Signed-off-by: Alan Cox <alan@xxxxxxxxxx> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc3-mm2/drivers/ata/pata_ns87410.c linux-2.6.21-rc3-mm2/drivers/ata/pata_ns87410.c --- linux.vanilla-2.6.21-rc3-mm2/drivers/ata/pata_ns87410.c 2007-03-08 16:01:10.000000000 +0000 +++ linux-2.6.21-rc3-mm2/drivers/ata/pata_ns87410.c 2007-03-08 17:11:36.000000000 +0000 @@ -28,14 +28,14 @@ #include <linux/libata.h> #define DRV_NAME "pata_ns87410" -#define DRV_VERSION "0.4.3" +#define DRV_VERSION "0.4.6" /** * ns87410_pre_reset - probe begin * @ap: ATA port * @deadline: deadline jiffies for the operation * - * Set up cable type and use generic probe init + * Check enabled ports */ static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline) @@ -48,7 +48,6 @@ if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) return -ENOENT; - ap->cbl = ATA_CBL_PATA40; return ata_std_prereset(ap, deadline); } @@ -178,6 +177,7 @@ .thaw = ata_bmdma_thaw, .error_handler = ns87410_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_40wire, .qc_prep = ata_qc_prep, .qc_issue = ns87410_qc_issue_prot, - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
