[NETFILTER]: Missed and reordered checks in {arp,ip,ip6}_tables

[powerpc.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c4dfcc9..9540eb8 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -3,11 +3,13 @@ menu "SCSI device support"
 config RAID_ATTRS
        tristate "RAID Transport Class"
        default n
+       depends on BLOCK
        ---help---
          Provides RAID
 
 config SCSI
        tristate "SCSI device support"
+       depends on BLOCK
        ---help---
          If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
          any other SCSI device under Linux, say Y and make sure that you know
@@ -38,10 +40,10 @@ config SCSI_PROC_FS
        default y
        ---help---
          This option enables support for the various files in
-         /proc/scsi.  In Linux 2.6 this has been superceeded by
+         /proc/scsi.  In Linux 2.6 this has been superseded by
          files in sysfs but many legacy applications rely on this.
 
-         If unusure say Y.
+         If unsure say Y.
 
 comment "SCSI support type (disk, tape, CD-ROM)"
        depends on SCSI
@@ -83,7 +85,7 @@ config CHR_DEV_OSST
        tristate "SCSI OnStream SC-x0 tape support"
        depends on SCSI
        ---help---
-         The OnStream SC-x0 SCSI tape drives can not be driven by the
+         The OnStream SC-x0 SCSI tape drives cannot be driven by the
          standard st driver, but instead need this special osst driver and
          use the  /dev/osstX char device nodes (major 206).  Via usb-storage
          and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
@@ -1014,7 +1016,7 @@ config SCSI_SYM53C8XX_MMIO
 
 config SCSI_IPR
        tristate "IBM Power Linux RAID adapter support"
-       depends on PCI && SCSI
+       depends on PCI && SCSI && ATA
        select FW_LOADER
        ---help---
          This driver supports the IBM Power Linux family RAID adapters.
@@ -1244,6 +1246,7 @@ config SCSI_QLOGICPTI
          module will be called qlogicpti.
 
 source "drivers/scsi/qla2xxx/Kconfig"
+source "drivers/scsi/qla4xxx/Kconfig"
 
 config SCSI_LPFC
        tristate "Emulex LightPulse Fibre Channel Support"
@@ -1260,8 +1263,8 @@ config SCSI_SEAGATE
          These are 8-bit SCSI controllers; the ST-01 is also supported by
          this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.  If it
-         doesn't work out of the box, you may have to change some settings in
-         <file:drivers/scsi/seagate.h>.
+         doesn't work out of the box, you may have to change some macros at
+         compiletime, which are described in <file:drivers/scsi/seagate.c>.
 
          To compile this driver as a module, choose M here: the
          module will be called seagate.