diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /drivers/scsi/qla1280.c | |
parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'drivers/scsi/qla1280.c')
-rw-r--r-- | drivers/scsi/qla1280.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 8cb9240596ab..df09820e8916 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
@@ -128,7 +128,7 @@ | |||
128 | - Integrate ql12160_set_target_parameters() with 1280 version | 128 | - Integrate ql12160_set_target_parameters() with 1280 version |
129 | - Make qla1280_setup() non static | 129 | - Make qla1280_setup() non static |
130 | - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request | 130 | - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request |
131 | sent to the card - this command pauses the firmare!!! | 131 | sent to the card - this command pauses the firmware!!! |
132 | Rev 3.23.15 Beta March 19, 2002, Jes Sorensen | 132 | Rev 3.23.15 Beta March 19, 2002, Jes Sorensen |
133 | - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions | 133 | - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions |
134 | - Remove a pile of pointless and confusing (srb_t **) and | 134 | - Remove a pile of pointless and confusing (srb_t **) and |
@@ -659,7 +659,7 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha) | |||
659 | /* The firmware interface is, um, interesting, in that the | 659 | /* The firmware interface is, um, interesting, in that the |
660 | * actual firmware image on the chip is little endian, thus, | 660 | * actual firmware image on the chip is little endian, thus, |
661 | * the process of taking that image to the CPU would end up | 661 | * the process of taking that image to the CPU would end up |
662 | * little endian. However, the firmare interface requires it | 662 | * little endian. However, the firmware interface requires it |
663 | * to be read a word (two bytes) at a time. | 663 | * to be read a word (two bytes) at a time. |
664 | * | 664 | * |
665 | * The net result of this would be that the word (and | 665 | * The net result of this would be that the word (and |