Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

[linux-2.6] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 99c57b0c1d540c5d8e7d63138ebd76bc7dc4db4f..26be540d1dd373ec79872fed9d97d71b3d8f16a1 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -504,10 +504,9 @@ config SCSI_AIC7XXX_OLD
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 source "drivers/scsi/aic94xx/Kconfig"
 
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 source "drivers/scsi/aic94xx/Kconfig"
 

-# All the I2O code and drivers do not seem to be 64bit safe.

 config SCSI_DPT_I2O
        tristate "Adaptec I2O RAID support "
 config SCSI_DPT_I2O
        tristate "Adaptec I2O RAID support "

-       depends on !64BIT && SCSI && PCI && VIRT_TO_BUS
+       depends on SCSI && PCI && VIRT_TO_BUS

        help
          This driver supports all of Adaptec's I2O based RAID controllers as 
          well as the DPT SmartRaid V cards.  This is an Adaptec maintained
        help
          This driver supports all of Adaptec's I2O based RAID controllers as 
          well as the DPT SmartRaid V cards.  This is an Adaptec maintained


@@ -889,6 +888,25 @@ config SCSI_IBMVSCSIS
          To compile this driver as a module, choose M here: the
          module will be called ibmvstgt.
 
          To compile this driver as a module, choose M here: the
          module will be called ibmvstgt.
 

+config SCSI_IBMVFC
+       tristate "IBM Virtual FC support"
+       depends on PPC_PSERIES && SCSI
+       select SCSI_FC_ATTRS
+       help
+         This is the IBM POWER Virtual FC Client
+
+         To compile this driver as a module, choose M here: the
+         module will be called ibmvfc.
+
+config SCSI_IBMVFC_TRACE
+       bool "enable driver internal trace"
+       depends on SCSI_IBMVFC
+       default y
+       help
+         If you say Y here, the driver will trace all commands issued
+         to the adapter. Performance impact is minimal. Trace can be
+         dumped using /sys/class/scsi_host/hostXX/trace.
+

 config SCSI_INITIO
        tristate "Initio 9100U(W) support"
        depends on PCI && SCSI
 config SCSI_INITIO
        tristate "Initio 9100U(W) support"
        depends on PCI && SCSI


@@ -1680,6 +1698,7 @@ config MAC_SCSI
 config SCSI_MAC_ESP
        tristate "Macintosh NCR53c9[46] SCSI"
        depends on MAC && SCSI
 config SCSI_MAC_ESP
        tristate "Macintosh NCR53c9[46] SCSI"
        depends on MAC && SCSI

+       select SCSI_SPI_ATTRS

        help
          This is the NCR 53c9x SCSI controller found on most of the 68040
          based Macintoshes.
        help
          This is the NCR 53c9x SCSI controller found on most of the 68040
          based Macintoshes.


@@ -1738,10 +1757,12 @@ config SCSI_SUNESP
        select SCSI_SPI_ATTRS
        help
          This is the driver for the Sun ESP SCSI host adapter. The ESP
        select SCSI_SPI_ATTRS
        help
          This is the driver for the Sun ESP SCSI host adapter. The ESP

-         chipset is present in most SPARC SBUS-based computers.
+         chipset is present in most SPARC SBUS-based computers and
+         supports the Emulex family of ESP SCSI chips (esp100, esp100A,
+         esp236, fas101, fas236) as well as the Qlogic fas366 SCSI chip.

 
          To compile this driver as a module, choose M here: the
 
          To compile this driver as a module, choose M here: the

-         module will be called esp.
+         module will be called sun_esp.

 
 config ZFCP
        tristate "FCP host bus adapter driver for IBM eServer zSeries"
 
 config ZFCP
        tristate "FCP host bus adapter driver for IBM eServer zSeries"


@@ -1771,4 +1792,6 @@ endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"
 
 
 source "drivers/scsi/pcmcia/Kconfig"
 

+source "drivers/scsi/device_handler/Kconfig"
+

 endmenu
 endmenu