diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:44:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:44:25 -0500 |
commit | 5f0b1437e0708772b6fecae5900c01c3b5f9b512 (patch) | |
tree | bcd923e305345178bc162ed8560d56a3af197224 /drivers/scsi/aic94xx/aic94xx_dump.c | |
parent | 574009c1a895aeeb85eaab29c235d75852b09eb8 (diff) | |
parent | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (97 commits)
[SCSI] zfcp: removed wrong comment
[SCSI] zfcp: use of uninitialized variable
[SCSI] zfcp: Invalid locking order
[SCSI] aic79xx: use dma_get_required_mask()
[SCSI] aic79xx: fix bracket mismatch in unused macro
[SCSI] BusLogic: Replace 'boolean' by 'bool'
[SCSI] advansys: clean up warnings
[SCSI] 53c7xx: brackets fix in uncompiled code
[SCSI] nsp_cs: remove old scsi code
[SCSI] aic79xx: make ahd_match_scb() static
[SCSI] DAC960: kmalloc->kzalloc/Casting cleanups
[SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
[SCSI] Buslogic: local_irq_disable() is redundant after local_irq_save()
[SCSI] aic94xx: update for v28 firmware
[SCSI] scsi_error: Fix lost EH commands
[SCSI] aic94xx: Add default bus reset handler
[SCSI] aic94xx: Remove TMF result code munging
[SCSI] libsas: Add an LU reset mechanism to the error handler
[SCSI] libsas: Don't BUG when connecting two expanders via wide port
[SCSI] st: fix Tape dies if wrong block size used, bug 7919
...
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_dump.c')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_dump.c b/drivers/scsi/aic94xx/aic94xx_dump.c index e6ade5996d95..6bd8e3059d27 100644 --- a/drivers/scsi/aic94xx/aic94xx_dump.c +++ b/drivers/scsi/aic94xx/aic94xx_dump.c | |||
@@ -556,7 +556,7 @@ static void asd_dump_lseq_state(struct asd_ha_struct *asd_ha, int lseq) | |||
556 | PRINT_LMIP_word(asd_ha, lseq, Q_TGTXFR_TAIL); | 556 | PRINT_LMIP_word(asd_ha, lseq, Q_TGTXFR_TAIL); |
557 | PRINT_LMIP_byte(asd_ha, lseq, LINK_NUMBER); | 557 | PRINT_LMIP_byte(asd_ha, lseq, LINK_NUMBER); |
558 | PRINT_LMIP_byte(asd_ha, lseq, SCRATCH_FLAGS); | 558 | PRINT_LMIP_byte(asd_ha, lseq, SCRATCH_FLAGS); |
559 | PRINT_LMIP_qword(asd_ha, lseq, CONNECTION_STATE); | 559 | PRINT_LMIP_dword(asd_ha, lseq, CONNECTION_STATE); |
560 | PRINT_LMIP_word(asd_ha, lseq, CONCTL); | 560 | PRINT_LMIP_word(asd_ha, lseq, CONCTL); |
561 | PRINT_LMIP_byte(asd_ha, lseq, CONSTAT); | 561 | PRINT_LMIP_byte(asd_ha, lseq, CONSTAT); |
562 | PRINT_LMIP_byte(asd_ha, lseq, CONNECTION_MODES); | 562 | PRINT_LMIP_byte(asd_ha, lseq, CONNECTION_MODES); |