[PATCH] constify pipe_buf_operations

[linux-2.6] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 99837d932f367f29ad0f520095defd63336ce179..984ab284382ae41fcd4c2c1aaaab80396359e023 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -6,6 +6,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 
 config ATA
        tristate "ATA device support"
+       depends on BLOCK
        depends on !(M32R || M68K) || BROKEN
        depends on !SUN4 || BROKEN
        select SCSI
@@ -311,7 +312,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.
@@ -327,6 +328,15 @@ config PATA_TRIFLEX
 
          If unsure, say N.
 
+config PATA_MARVELL
+       tristate "Marvell PATA support via legacy mode"
+       depends on PCI
+       help
+         This option enables limited support for the Marvell 88SE6145 ATA
+         controller.
+
+         If unsure, say N.
+
 config PATA_MPIIX
        tristate "Intel PATA MPIIX support"
        depends on PCI
@@ -400,6 +410,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.
 
@@ -481,6 +492,32 @@ config PATA_WINBOND
 
          If unsure, say N.
 
+config PATA_WINBOND_VLB
+       tristate "Winbond W83759A VLB PATA support (Experimental)"
+       depends on ISA && EXPERIMENTAL
+       help
+         Support for the Winbond W83759A controller on Vesa Local Bus
+         systems.
+
+config PATA_PLATFORM
+       tristate "Generic platform device PATA support"
+       depends on EMBEDDED
+       help
+         This option enables support for generic directly connected ATA
+         devices commonly found on embedded systems.
+
+         If unsure, say N.
+
+config PATA_IXP4XX_CF
+       tristate "IXP4XX Compact Flash support"
+       depends on ARCH_IXP4XX
+       help
+         This option enables support for a Compact Flash connected on
+         the ixp4xx expansion bus. This driver had been written for
+         Loft/Avila boards in mind but can work with others.
+
+         If unsure, say N.
+
 endif
 endmenu