summaryrefslogtreecommitdiff
path: root/drivers/scsi/aha1542.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-22 21:07:28 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-22 21:07:28 +0400
commitff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch)
tree3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /drivers/scsi/aha1542.h
parent8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff)
parent2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff)
downloadlinux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.xz
Merge upstream kernel changes into 'C/H/S support' branch of libata.
Diffstat (limited to 'drivers/scsi/aha1542.h')
-rw-r--r--drivers/scsi/aha1542.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index c402351dc79a..3821ee17f471 100644
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -133,7 +133,6 @@ struct ccb { /* Command Control Block 5.3 */
static int aha1542_detect(Scsi_Host_Template *);
static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-static int aha1542_abort(Scsi_Cmnd * SCpnt);
static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
static int aha1542_host_reset(Scsi_Cmnd * SCpnt);