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 99837d932f367f29ad0f520095defd63336ce179..3f4aa0c99ee4dccaf096330732887bc5be153f79 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -311,7 +311,7 @@ config PATA_JMICRON
 
 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.
@@ -400,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.