Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[sfrench/cifs-2.6.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 69569096dae537f164d52df669510de68bf866a8..5bf3f07870ba14f86a5805e3e9f13260420ba564 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -973,6 +973,15 @@ config SCSI_LASI700
          many PA-RISC workstations & servers.  If you do not know whether you
          have a Lasi chip, it is safe to say "Y" here.
 
+config SCSI_SNI_53C710
+       tristate "SNI RM SCSI support for 53c710"
+       depends on SNI_RM && SCSI
+       select SCSI_SPI_ATTRS
+       select 53C700_LE_ON_BE
+       help
+         This is a driver for the onboard SCSI controller found in older
+         SNI RM workstations & servers.
+
 config 53C700_LE_ON_BE
        bool
        depends on SCSI_LASI700
@@ -1303,7 +1312,7 @@ config SCSI_LPFC
 
 config SCSI_SEAGATE
        tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
-       depends on X86 && ISA && SCSI && BROKEN
+       depends on X86 && ISA && SCSI
        ---help---
          These are 8-bit SCSI controllers; the ST-01 is also supported by
          this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
@@ -1737,7 +1746,7 @@ config SCSI_NCR53C7xx_FAST
 
 config SUN3_SCSI
        tristate "Sun3 NCR5380 SCSI"
-       depends on SUN3 && SCSI && BROKEN
+       depends on SUN3 && SCSI
        select SCSI_SPI_ATTRS
        help
          This option will enable support for the OBIO (onboard io) NCR5380