summaryrefslogtreecommitdiff
path: root/drivers/scsi/aha1542.h
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-06-18 04:04:18 +0400
committerJames Bottomley <jejb@titanic.(none)>2005-06-18 04:04:18 +0400
commit3afa294c40013be5d8180005002e3f648d04d942 (patch)
tree8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/scsi/aha1542.h
parenta1541d5af66d02426655b1498f814c52347dd7d3 (diff)
parent3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff)
downloadlinux-3afa294c40013be5d8180005002e3f648d04d942.tar.xz
merge by hand (qla_os.c mismerge)
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);