Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[powerpc.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e23bc0d..ec03341 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -167,6 +167,13 @@ config BLK_DEV_IDECS
          Support for Compact Flash cards, outboard IDE disks, tape drives,
          and CD-ROM drives connected through a PCMCIA card.
 
+config BLK_DEV_DELKIN
+       tristate "Cardbus IDE support (Delkin/ASKA/Workbit)"
+       depends on CARDBUS && PCI
+       help
+         Support for Delkin, ASKA, and Workbit Cardbus CompactFlash
+         Adapters.  This may also work for similar SD and XD adapters.
+
 config BLK_DEV_IDECD
        tristate "Include IDE/ATAPI CDROM support"
        ---help---
@@ -264,6 +271,13 @@ config BLK_DEV_IDESCSI
          If both this SCSI emulation and native ATAPI support are compiled
          into the kernel, the native support will be used.
 
+config BLK_DEV_IDEACPI
+       bool "IDE ACPI support"
+       depends on ACPI
+       ---help---
+         Implement ACPI support for generic IDE devices. On modern
+         machines ACPI support is required to properly handle ACPI S3 states.
+
 config IDE_TASK_IOCTL
        bool "IDE Taskfile Access"
        help
@@ -606,6 +620,11 @@ config BLK_DEV_PIIX
          the kernel to change PIO, DMA and UDMA speeds and to configure
          the chip to optimum performance.
 
+config BLK_DEV_IT8213
+       tristate "IT8213 IDE support"
+       help
+        This driver adds support for the ITE 8213 IDE controller.
+
 config BLK_DEV_IT821X
        tristate "IT821X IDE support"
        help
@@ -742,6 +761,11 @@ config BLK_DEV_VIA82CXXX
          This allows the kernel to change PIO, DMA and UDMA speeds and to
          configure the chip to optimum performance.
 
+config BLK_DEV_TC86C001
+       tristate "Toshiba TC86C001 support"
+       help
+       This driver adds support for Toshiba TC86C001 GOKU-S chip.
+
 endif
 
 config BLK_DEV_IDE_PMAC
@@ -796,7 +820,7 @@ endchoice
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"
-       depends BLK_DEV_IDE_AU1XXX
+       depends on BLK_DEV_IDE_AU1XXX
 
 config IDE_ARM
        def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)