Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...

[pandora-kernel.git] / drivers / ata / pata_scc.c

diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index eb748e3..e265f83 100644 (file)
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -825,18 +825,6 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
        return words << 1;
 }
 
-/**
- *     scc_pata_prereset - prepare for reset
- *     @ap: ATA port to be reset
- *     @deadline: deadline jiffies for the operation
- */
-
-static int scc_pata_prereset(struct ata_link *link, unsigned long deadline)
-{
-       link->ap->cbl = ATA_CBL_PATA80;
-       return ata_sff_prereset(link, deadline);
-}
-
 /**
  *     scc_postreset - standard postreset callback
  *     @ap: the target ata_port
@@ -946,7 +934,7 @@ static struct ata_port_operations scc_pata_ops = {
        .bmdma_status           = scc_bmdma_status,
        .sff_data_xfer          = scc_data_xfer,
 
-       .prereset               = scc_pata_prereset,
+       .cable_detect           = ata_cable_80wire,
        .softreset              = scc_softreset,
        .postreset              = scc_postreset,