Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cbda988692e7ba97c94fccb015aad5ab5ec0465b..3f4aa0c99ee4dccaf096330732887bc5be153f79 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -6,6 +6,8 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 
 config ATA
        tristate "ATA device support"
+       depends on !(M32R || M68K) || BROKEN
+       depends on !SUN4 || BROKEN
        select SCSI
        ---help---
          If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
@@ -288,15 +290,6 @@ config PATA_ISAPNP
 
          If unsure, say N.
 
-config PATA_IT8172
-       tristate "IT8172 PATA support (Very Experimental)"
-       depends on PCI && EXPERIMENTAL
-       help
-         This option enables support for the ITE 8172 PATA controller
-         via the new ATA layer.
-
-         If unsure, say N.
-
 config PATA_IT821X
        tristate "IT821x PATA support (Experimental)"
        depends on PCI && EXPERIMENTAL
@@ -307,9 +300,18 @@ config PATA_IT821X
 
          If unsure, say N.
 
+config PATA_JMICRON
+       tristate "JMicron PATA support"
+       depends on PCI
+       help
+         Enable support for the JMicron IDE controller, via the new
+         ATA layer.
+
+         If unsure, say N.
+
 config PATA_LEGACY
        tristate "Legacy ISA PATA support (Experimental)"
-       depends on PCI && EXPERIMENTAL
+       depends on ISA && EXPERIMENTAL
        help
          This option enables support for ISA/VLB bus legacy PATA
          ports and allows them to be accessed via the new ATA layer.
@@ -398,6 +400,7 @@ config PATA_PDC_OLD
 
 config PATA_QDI
        tristate "QDI VLB PATA support"
+       depends on ISA
        help
          Support for QDI 6500 and 6580 PATA controllers on VESA local bus.