diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
| commit | c4e00fac42f268ed0a547cdd1d12bb8399864040 (patch) | |
| tree | 1a54d87be2066c49b71a03764fcb4fc7f9c68c41 /drivers/scsi/aic7xxx/aic79xx.h | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| parent | d6b0c53723753fc0cfda63f56735b225c43e1e9a (diff) | |
Merge ../scsi-misc-2.6
Conflicts:
drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c
Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx.h')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h index eb7745692682..df3346b5caf8 100644 --- a/drivers/scsi/aic7xxx/aic79xx.h +++ b/drivers/scsi/aic7xxx/aic79xx.h | |||
| @@ -1487,6 +1487,7 @@ typedef enum { | |||
| 1487 | } ahd_queue_alg; | 1487 | } ahd_queue_alg; |
| 1488 | 1488 | ||
| 1489 | void ahd_set_tags(struct ahd_softc *ahd, | 1489 | void ahd_set_tags(struct ahd_softc *ahd, |
| 1490 | struct scsi_cmnd *cmd, | ||
| 1490 | struct ahd_devinfo *devinfo, | 1491 | struct ahd_devinfo *devinfo, |
| 1491 | ahd_queue_alg alg); | 1492 | ahd_queue_alg alg); |
| 1492 | 1493 | ||