Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 9 insertions, 19 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index fcc4cb6c7f46..e62d23f65180 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -170,7 +170,7 @@ config CHR_DEV_SCH
         
           If you want to compile this as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt> and
+          say M here and read <file:Documentation/kbuild/modules.txt> and
           <file:Documentation/scsi.txt>. The module will be called ch.o.
           If unsure, say N.
         
@@ -241,6 +241,12 @@ config SCSI_SCAN_ASYNC
           You can override this choice by specifying "scsi_mod.scan=sync"
           or async on the kernel's command line.
 
+config SCSI_WAIT_SCAN
+        tristate
+        default m
+        depends on SCSI
+        depends on MODULES
+
 menu "SCSI Transports"
         depends on SCSI
 
@@ -1194,17 +1200,6 @@ config SCSI_NCR53C8XX_SYNC
           There is no safe option other than using good cabling, right
           terminations and SCSI conformant devices.
 
-config SCSI_NCR53C8XX_PROFILE
-        bool "enable profiling"
-        depends on SCSI_ZALON || SCSI_NCR_Q720
-        help
-          This option allows you to enable profiling information gathering.
-          These statistics are not very accurate due to the low frequency
-          of the kernel clock (100 Hz on i386) and have performance impact
-          on systems that use very fast devices.
-
-          The normal answer therefore is N.
-
 config SCSI_NCR53C8XX_NO_DISCONNECT
         bool "not allow targets to disconnect"
         depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
@@ -1334,11 +1329,6 @@ config SCSI_SIM710
 
           It currently supports Compaq EISA cards and NCR MCA cards
 
-config 53C700_IO_MAPPED
-        bool
-        depends on SCSI_SIM710
-        default y
-
 config SCSI_SYM53C416
         tristate "Symbios 53c416 SCSI support"
         depends on ISA && SCSI
@@ -1649,7 +1639,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,
@@ -1793,7 +1783,7 @@ config ZFCP
 
           This driver is also available as a module. This module will be
           called zfcp. If you want to compile it as a module, say M here
-          and read <file:Documentation/modules.txt>.
+          and read <file:Documentation/kbuild/modules.txt>.
 
 config SCSI_SRP
         tristate "SCSI RDMA Protocol helper library"