summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pas16.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 19:44:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 19:44:22 +0100
commit8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch)
treed4933996296141103b1f54e563268b23c95d6dd4 /drivers/scsi/pas16.h
parentstaging: fix winbond build, needs delay.h (diff)
parentUn-inline get_pipe_info() helper function (diff)
downloadlinux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz
linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip
Merge branch 'master' into work
Diffstat (limited to 'drivers/scsi/pas16.h')
-rw-r--r--drivers/scsi/pas16.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index 8dc5b1a5f5da..a04281cace2e 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -118,7 +118,7 @@ static int pas16_abort(Scsi_Cmnd *);
static int pas16_biosparam(struct scsi_device *, struct block_device *,
sector_t, int*);
static int pas16_detect(struct scsi_host_template *);
-static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
+static int pas16_queue_command(struct Scsi_Host *, struct scsi_cmnd *);
static int pas16_bus_reset(Scsi_Cmnd *);
#ifndef CMD_PER_LUN