Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3aa664f..8d9dae8 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -833,10 +833,7 @@ config SCSI_GDTH
 config SCSI_ISCI
        tristate "Intel(R) C600 Series Chipset SAS Controller"
        depends on PCI && SCSI
-       # little endian host assumptions
        depends on X86
-       # (temporary): dma api misuse
-       depends on !DMAR
        # (temporary): known alpha quality driver
        depends on EXPERIMENTAL
        select SCSI_SAS_LIBSAS
@@ -846,24 +843,6 @@ config SCSI_ISCI
 
          The experimental tag will be removed after the driver exits alpha
 
-choice
-       prompt "Default Silicon Revision"
-       depends on SCSI_ISCI
-       default PBG_HBA_A2
-       # temporary A-step silicon is pre-production
-
-config PBG_HBA_BETA
-       bool "B0"
-
-config PBG_HBA_A2
-       bool "A2"
-
-config PBG_HBA_A0
-       bool "A0"
-
-endchoice
-
-
 config SCSI_GENERIC_NCR5380
        tristate "Generic NCR5380/53c400 SCSI PIO support"
        depends on ISA && SCSI