Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[sfrench/cifs-2.6.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index bbec3a814ea7731c430da27fb4439828826cd910..8ed2990c826eb04a5d320088732d6d19bf0ab1c7 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -121,10 +121,11 @@ config BLK_DEV_SR
        tristate "SCSI CDROM support"
        depends on SCSI
        ---help---
-         If you want to use a SCSI or FireWire CD-ROM under Linux,
-         say Y and read the SCSI-HOWTO and the CDROM-HOWTO at
-         <http://www.tldp.org/docs.html#howto>. Also make sure to say
-         Y or M to "ISO 9660 CD-ROM file system support" later.
+         If you want to use a CD or DVD drive attached to your computer
+         by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO
+         and the CDROM-HOWTO at <http://www.tldp.org/docs.html#howto>.
+
+         Make sure to say Y or M to "ISO 9660 CD-ROM file system support".
 
          To compile this driver as a module, choose M here and read
          <file:Documentation/scsi/scsi.txt>.
@@ -1386,7 +1387,7 @@ config SCSI_LPFC_DEBUG_FS
        bool "Emulex LightPulse Fibre Channel debugfs Support"
        depends on SCSI_LPFC && DEBUG_FS
        help
-         This makes debugging infomation from the lpfc driver
+         This makes debugging information from the lpfc driver
          available via the debugfs filesystem.
 
 config SCSI_SIM710
@@ -1394,7 +1395,7 @@ config SCSI_SIM710
        depends on (EISA || MCA) && SCSI
        select SCSI_SPI_ATTRS
        ---help---
-         This driver for NCR53c710 based SCSI host adapters.
+         This driver is for NCR53c710 based SCSI host adapters.
 
          It currently supports Compaq EISA cards and NCR MCA cards