Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 5bf3f07..e1ebed0 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -230,6 +230,7 @@ config SCSI_SCAN_ASYNC
          The SCSI subsystem can probe for devices while the rest of the
          system continues booting, and even probe devices on different
          busses in parallel, leading to a significant speed-up.
+
          If you have built SCSI as modules, enabling this option can
          be a problem as the devices may not have been found by the
          time your system expects them to have been.  You can load the
@@ -237,8 +238,8 @@ config SCSI_SCAN_ASYNC
          If you build your SCSI drivers into the kernel, then everything
          will work fine if you say Y here.
 
-         You can override this choice by specifying scsi_mod.scan="sync"
-         or "async" on the kernel's command line.
+         You can override this choice by specifying "scsi_mod.scan=sync"
+         or async on the kernel's command line.
 
 menu "SCSI Transports"
        depends on SCSI
@@ -1648,7 +1649,7 @@ config OKTAGON_SCSI
 
 config ATARI_SCSI
        tristate "Atari native SCSI support"
-       depends on ATARI && SCSI && BROKEN
+       depends on ATARI && SCSI
        select SCSI_SPI_ATTRS
        ---help---
          If you have an Atari with built-in NCR5380 SCSI controller (TT,
@@ -1762,9 +1763,15 @@ 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.