diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /drivers/scsi | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (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: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e2f44e6c0bcb..20297c521e50 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1380,7 +1380,7 @@ config SCSI_LPFC_DEBUG_FS | |||
| 1380 | bool "Emulex LightPulse Fibre Channel debugfs Support" | 1380 | bool "Emulex LightPulse Fibre Channel debugfs Support" |
| 1381 | depends on SCSI_LPFC && DEBUG_FS | 1381 | depends on SCSI_LPFC && DEBUG_FS |
| 1382 | help | 1382 | help |
| 1383 | This makes debugging infomation from the lpfc driver | 1383 | This makes debugging information from the lpfc driver |
| 1384 | available via the debugfs filesystem. | 1384 | available via the debugfs filesystem. |
| 1385 | 1385 | ||
| 1386 | config SCSI_SIM710 | 1386 | config SCSI_SIM710 |
| @@ -1388,7 +1388,7 @@ config SCSI_SIM710 | |||
| 1388 | depends on (EISA || MCA) && SCSI | 1388 | depends on (EISA || MCA) && SCSI |
| 1389 | select SCSI_SPI_ATTRS | 1389 | select SCSI_SPI_ATTRS |
| 1390 | ---help--- | 1390 | ---help--- |
| 1391 | This driver for NCR53c710 based SCSI host adapters. | 1391 | This driver is for NCR53c710 based SCSI host adapters. |
| 1392 | 1392 | ||
| 1393 | It currently supports Compaq EISA cards and NCR MCA cards | 1393 | It currently supports Compaq EISA cards and NCR MCA cards |
| 1394 | 1394 | ||