Merge remote-tracking branch 'scsi/for-next'

[linux] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 85c5c89..78aeabd 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1367,14 +1367,14 @@ config ATARI_SCSI
        tristate "Atari native SCSI support"
        depends on ATARI && SCSI
        select SCSI_SPI_ATTRS
-       select NVRAM
        ---help---
          If you have an Atari with built-in NCR5380 SCSI controller (TT,
          Falcon, ...) say Y to get it supported. Of course also, if you have
          a compatible SCSI controller (e.g. for Medusa).
 
-         To compile this driver as a module, choose M here: the
-         module will be called atari_scsi.
+         To compile this driver as a module, choose M here: the module will
+         be called atari_scsi. If you also enable NVRAM support, the SCSI
+         host's ID is taken from the setting in TT RTC NVRAM.
 
          This driver supports both styles of NCR integration into the
          system: the TT style (separate DMA), and the Falcon style (via