[SCSI] Merge up to linux-2.6 head

[linux-beck.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e62d23f651804c75d538c01a1c9622bf6ce447fa..aac9cd9a172f0c5f57eb21fede3e95596cd28d8f 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -738,7 +738,7 @@ config SCSI_GENERIC_NCR53C400
 
 config SCSI_IBMMCA
        tristate "IBMMCA SCSI support"
-       depends on MCA_LEGACY && SCSI
+       depends on MCA && SCSI
        ---help---
          This is support for the IBM SCSI adapter found in many of the PS/2
          series computers.  These machines have an MCA bus, so you need to
@@ -1753,15 +1753,9 @@ config SUN3X_ESP
          The ESP was an on-board SCSI controller used on Sun 3/80
          machines.  Say Y here to compile in support for it.
 
-config SCSI_ESP_CORE
-       tristate "ESP Scsi Driver Core"
-       depends on SCSI
-       select SCSI_SPI_ATTRS
-
 config SCSI_SUNESP
        tristate "Sparc ESP Scsi Driver"
        depends on SBUS && SCSI
-       select SCSI_ESP_CORE
        help
          This is the driver for the Sun ESP SCSI host adapter. The ESP
          chipset is present in most SPARC SBUS-based computers.