Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...

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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 5987e0b..6bdedd7 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -820,7 +820,7 @@ config PATA_PLATFORM
 
 config PATA_OF_PLATFORM
        tristate "OpenFirmware platform device PATA support"
 
 config PATA_OF_PLATFORM
        tristate "OpenFirmware platform device PATA support"

-       depends on PATA_PLATFORM && PPC_OF
+       depends on PATA_PLATFORM && OF

        help
          This option enables support for generic directly connected ATA
          devices commonly found on embedded systems with OpenFirmware
        help
          This option enables support for generic directly connected ATA
          devices commonly found on embedded systems with OpenFirmware


@@ -831,6 +831,7 @@ config PATA_OF_PLATFORM
 config PATA_QDI
        tristate "QDI VLB PATA support"
        depends on ISA
 config PATA_QDI
        tristate "QDI VLB PATA support"
        depends on ISA

+       select PATA_LEGACY

        help
          Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
 
        help
          Support for QDI 6500 and 6580 PATA controllers on VESA local bus.