summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha1542.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-20 15:51:24 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-20 15:51:24 +0100
commitdf5179854bca84ac5be500849b12dd33ce03f03f (patch)
tree78cf16415489e70f34c58f2c7f5c2e63696e9761 /drivers/scsi/aha1542.h
parent0f45aa18e65cf3d768082d7d86054a0d2a20bb18 (diff)
parent8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff)
downloadblackbird-op-linux-df5179854bca84ac5be500849b12dd33ce03f03f.tar.gz
blackbird-op-linux-df5179854bca84ac5be500849b12dd33ce03f03f.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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);
OpenPOWER on IntegriCloud