diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/scsi/mvme16x.h | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/mvme16x.h')
-rw-r--r-- | drivers/scsi/mvme16x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mvme16x.h b/drivers/scsi/mvme16x.h index c7a12533fb2c..73e33b37a3f8 100644 --- a/drivers/scsi/mvme16x.h +++ b/drivers/scsi/mvme16x.h | |||
@@ -9,7 +9,7 @@ int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); | |||
9 | int NCR53c7xx_abort(Scsi_Cmnd *); | 9 | int NCR53c7xx_abort(Scsi_Cmnd *); |
10 | int NCR53c7x0_release (struct Scsi_Host *); | 10 | int NCR53c7x0_release (struct Scsi_Host *); |
11 | int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int); | 11 | int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int); |
12 | void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs); | 12 | void NCR53c7x0_intr(int irq, void *dev_id); |
13 | 13 | ||
14 | #ifndef CMD_PER_LUN | 14 | #ifndef CMD_PER_LUN |
15 | #define CMD_PER_LUN 3 | 15 | #define CMD_PER_LUN 3 |