diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /drivers/scsi/Kconfig | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index dab082002e6f..c6dfb6fa13bf 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -40,10 +40,10 @@ config SCSI_PROC_FS | |||
| 40 | default y | 40 | default y |
| 41 | ---help--- | 41 | ---help--- |
| 42 | This option enables support for the various files in | 42 | This option enables support for the various files in |
| 43 | /proc/scsi. In Linux 2.6 this has been superceeded by | 43 | /proc/scsi. In Linux 2.6 this has been superseded by |
| 44 | files in sysfs but many legacy applications rely on this. | 44 | files in sysfs but many legacy applications rely on this. |
| 45 | 45 | ||
| 46 | If unusure say Y. | 46 | If unsure say Y. |
| 47 | 47 | ||
| 48 | comment "SCSI support type (disk, tape, CD-ROM)" | 48 | comment "SCSI support type (disk, tape, CD-ROM)" |
| 49 | depends on SCSI | 49 | depends on SCSI |
| @@ -85,7 +85,7 @@ config CHR_DEV_OSST | |||
| 85 | tristate "SCSI OnStream SC-x0 tape support" | 85 | tristate "SCSI OnStream SC-x0 tape support" |
| 86 | depends on SCSI | 86 | depends on SCSI |
| 87 | ---help--- | 87 | ---help--- |
| 88 | The OnStream SC-x0 SCSI tape drives can not be driven by the | 88 | The OnStream SC-x0 SCSI tape drives cannot be driven by the |
| 89 | standard st driver, but instead need this special osst driver and | 89 | standard st driver, but instead need this special osst driver and |
| 90 | use the /dev/osstX char device nodes (major 206). Via usb-storage | 90 | use the /dev/osstX char device nodes (major 206). Via usb-storage |
| 91 | and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives | 91 | and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives |