diff --git a/[refs] b/[refs] index 60e8401a37f0..3b2d2c00c8d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02f076aaa1478a91762de522ecb029efbc279690 +refs/heads/master: 4735ebedf37731160e3d3efc9fc9d4939c66fefa diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index 99837d932f36..3f4aa0c99ee4 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/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.