Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[mirror_ubuntu-zesty-kernel.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 9b58d32dcedf541cc03cdc9966103742ab0b76ea..3e751b74615eac73bbf1835aa404337cd0cd6431 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -14,7 +14,7 @@ menuconfig ATA
        tristate "Serial ATA and Parallel ATA drivers"
        depends on HAS_IOMEM
        depends on BLOCK
-       depends on !(M32R || M68K) || BROKEN
+       depends on !(M32R || M68K || S390) || BROKEN
        select SCSI
        ---help---
          If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
@@ -176,7 +176,7 @@ config SATA_QSTOR
 
 config SATA_SX4
        tristate "Promise SATA SX4 support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables support for Promise Serial ATA SX4.
 
@@ -411,7 +411,7 @@ config PATA_CS5530
 
 config PATA_CS5535
        tristate "CS5535 PATA support (Experimental)"
-       depends on PCI && X86 && !X86_64 && EXPERIMENTAL
+       depends on PCI && X86 && !X86_64
        help
          This option enables support for the NatSemi/AMD CS5535
          companion chip used with the Geode processor family.
@@ -429,7 +429,7 @@ config PATA_CS5536
 
 config PATA_CYPRESS
        tristate "Cypress CY82C693 PATA support (Very Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables support for the Cypress/Contaq CY82C693
          chipset found in some Alpha systems
@@ -517,7 +517,7 @@ config PATA_IMX
 
 config PATA_IT8213
        tristate "IT8213 PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables support for the ITE 821 PATA
           controllers via the new ATA layer.
@@ -610,7 +610,7 @@ config PATA_OLDPIIX
 
 config PATA_OPTIDMA
        tristate "OPTI FireStar PATA support (Very Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables DMA/PIO support for the later OPTi
          controllers found on some old motherboards and in some
@@ -637,7 +637,7 @@ config PATA_PDC_OLD
 
 config PATA_RADISYS
        tristate "RADISYS 82600 PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables support for the RADISYS 82600
          PATA controllers via the new ATA layer
@@ -708,7 +708,7 @@ config PATA_SIS
 
 config PATA_TOSHIBA
        tristate "Toshiba Piccolo support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          Support for the Toshiba Piccolo controllers. Currently only the
          primary channel is supported by this driver.
@@ -759,7 +759,7 @@ comment "PIO-only SFF controllers"
 
 config PATA_AT32
        tristate "Atmel AVR32 PATA support (Experimental)"
-       depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL
+       depends on AVR32 && PLATFORM_AT32AP
        help
          This option enables support for the IDE devices on the
          Atmel AT32AP platform.
@@ -776,7 +776,7 @@ config PATA_AT91
 
 config PATA_CMD640_PCI
        tristate "CMD640 PCI PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables support for the CMD640 PCI IDE
          interface chip. Only the primary channel is currently
@@ -822,7 +822,7 @@ config PATA_NS87410
 
 config PATA_OPTI
        tristate "OPTI621/6215 PATA support (Very Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          This option enables full PIO support for the early Opti ATA
          controllers found on some old motherboards.
@@ -902,7 +902,7 @@ config PATA_SAMSUNG_CF
 
 config PATA_WINBOND_VLB
        tristate "Winbond W83759A VLB PATA support (Experimental)"
-       depends on ISA && EXPERIMENTAL
+       depends on ISA
        select PATA_LEGACY
        help
          Support for the Winbond W83759A controller on Vesa Local Bus
@@ -930,7 +930,7 @@ config ATA_GENERIC
 
 config PATA_LEGACY
        tristate "Legacy ISA PATA support (Experimental)"
-       depends on (ISA || PCI) && EXPERIMENTAL
+       depends on (ISA || PCI)
        help
          This option enables support for ISA/VLB/PCI bus legacy PATA
          ports and allows them to be accessed via the new ATA layer.