diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /drivers/scsi/qlogicfas408.h | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'drivers/scsi/qlogicfas408.h')
| -rw-r--r-- | drivers/scsi/qlogicfas408.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h index 260626427a32..2f6c0a166200 100644 --- a/drivers/scsi/qlogicfas408.h +++ b/drivers/scsi/qlogicfas408.h | |||
| @@ -103,8 +103,7 @@ struct qlogicfas408_priv { | |||
| 103 | #define get_priv_by_host(x) (struct qlogicfas408_priv *)&((x)->hostdata[0]) | 103 | #define get_priv_by_host(x) (struct qlogicfas408_priv *)&((x)->hostdata[0]) |
| 104 | 104 | ||
| 105 | irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id); | 105 | irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id); |
| 106 | int qlogicfas408_queuecommand(struct scsi_cmnd * cmd, | 106 | int qlogicfas408_queuecommand(struct Scsi_Host *h, struct scsi_cmnd * cmd); |
| 107 | void (*done) (struct scsi_cmnd *)); | ||
| 108 | int qlogicfas408_biosparam(struct scsi_device * disk, | 107 | int qlogicfas408_biosparam(struct scsi_device * disk, |
| 109 | struct block_device *dev, | 108 | struct block_device *dev, |
| 110 | sector_t capacity, int ip[]); | 109 | sector_t capacity, int ip[]); |