Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index a47ca75..01c52c4 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -40,7 +40,6 @@ config ATA_VERBOSE_ERROR
 config ATA_ACPI
        bool "ATA ACPI Support"
        depends on ACPI && PCI
-       select ACPI_DOCK
        default y
        help
          This option adds support for ATA-related ACPI objects.
@@ -447,9 +446,9 @@ config PATA_JMICRON
 
 config PATA_LEGACY
        tristate "Legacy ISA PATA support (Experimental)"
-       depends on ISA && EXPERIMENTAL
+       depends on (ISA || PCI)  && EXPERIMENTAL
        help
-         This option enables support for ISA/VLB bus legacy PATA
+         This option enables support for ISA/VLB/PCI bus legacy PATA
          ports and allows them to be accessed via the new ATA layer.
 
          If unsure, say N.
@@ -667,6 +666,15 @@ config PATA_SIS
 
          If unsure, say N.
 
+config PATA_TOSHIBA
+       tristate "Toshiba Piccolo support (Experimental)"
+       depends on PCI && EXPERIMENTAL
+       help
+         Support for the Toshiba Piccolo controllers. Currently only the
+         primary channel is supported by this driver.
+
+         If unsure, say N.
+
 config PATA_VIA
        tristate "VIA PATA support"
        depends on PCI
@@ -781,5 +789,15 @@ config PATA_BF54X
 
          If unsure, say N.
 
+config PATA_MACIO
+       tristate "Apple PowerMac/PowerBook internal 'MacIO' IDE"
+       depends on PPC_PMAC
+       help
+         Most IDE capable PowerMacs have IDE busses driven by a variant
+          of this controller which is part of the Apple chipset used on
+          most PowerMac models. Some models have multiple busses using
+          different chipsets, though generally, MacIO is one of them.
+
+
 endif # ATA_SFF
 endif # ATA