This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 096cf25..75d8026 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -280,6 +280,15 @@ config IDE_TASK_IOCTL
 
          If you are unsure, say N here.
 
+config IDE_TASKFILE_IO
+       bool 'IDE Taskfile IO (EXPERIMENTAL)'
+       depends on EXPERIMENTAL
+       default n
+       ---help---
+         Use new taskfile IO code.
+
+         It is safe to say Y to this question, in most cases.
+
 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
@@ -614,11 +623,11 @@ config BLK_DEV_IT8172
          <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
          board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
-config BLK_DEV_IT821X
-       tristate "IT821X IDE support"
+config BLK_DEV_IT8212
+       tristate "IT8212 IDE support"
        help
-         This driver adds support for the ITE 8211 IDE controller and the
-         IT 8212 IDE RAID controller in both RAID and pass-through mode. 
+         This driver adds support for the ITE 8212 IDE RAID controller in
+         both RAID and pass-through mode. 
 
 config BLK_DEV_NS87415
        tristate "NS87415 chipset support"
@@ -785,6 +794,17 @@ config BLK_DEV_IDE_PMAC_BLINK
          This option enables the use of the sleep LED as a hard drive
          activity LED.
 
+config BLK_DEV_IDEDMA_PMAC_AUTO
+       bool "Use DMA by default"
+       depends on BLK_DEV_IDEDMA_PMAC
+       help
+         This option allows the driver for the built-in IDE controller on
+         Power Macintoshes and PowerBooks to use DMA automatically, without
+         it having to be explicitly enabled.  This option is provided because
+         of concerns about a couple of cases where using DMA on buggy PC
+         hardware may have caused damage.  Saying Y should be safe on all
+         Apple machines.
+
 config IDE_ARM
        def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
 
@@ -1000,6 +1020,19 @@ config BLK_DEV_HT6560B
          See the <file:Documentation/ide.txt> and
          <file:drivers/ide/legacy/ht6560b.c> files for more info.
 
+config BLK_DEV_PDC4030
+       tristate "PROMISE DC4030 support (EXPERIMENTAL)"
+       depends on BLK_DEV_IDEDISK && EXPERIMENTAL
+       help
+         This driver provides support for the secondary IDE interface and
+         cache of the original Promise IDE chipsets, e.g. DC4030 and DC5030.
+         It is nothing to do with the later range of Promise UDMA chipsets -
+         see the PDC_202XX support for these. CD-ROM and TAPE devices are not
+         supported (and probably never will be since I don't think the cards
+         support them). This driver is enabled at runtime using the "ide0=dc4030"
+         or "ide1=dc4030" kernel boot parameter. See the
+         <file:drivers/ide/legacy/pdc4030.c> file for more info.
+
 config BLK_DEV_QD65XX
        tristate "QDI QD65xx support"
        help
@@ -1039,7 +1072,7 @@ config IDEDMA_IVB
          It is normally safe to answer Y; however, the default is N.
 
 config IDEDMA_AUTO
-       def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO
+       def_bool IDEDMA_PCI_AUTO || BLK_DEV_IDEDMA_PMAC_AUTO || IDEDMA_ICS_AUTO
 
 endif