Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh...

[linux-2.6] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index d781b2cd3d62acd9edf6b92dbc9890c50b732d40..ec03341d2bd8c2e934478c0cbc0826216cd2576c 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.
 
          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---
 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.
 
          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
 config IDE_TASK_IOCTL
        bool "IDE Taskfile Access"
        help