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 0524f17175fd5abd7d36c029226efbc5352c7b63..ec03341d2bd8c2e934478c0cbc0826216cd2576c 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -56,7 +56,7 @@ if IDE
 
 config IDE_MAX_HWIFS
        int "Max IDE interfaces"
 
 config IDE_MAX_HWIFS
        int "Max IDE interfaces"

-       depends on ALPHA || SUPERH || IA64
+       depends on ALPHA || SUPERH || IA64 || EMBEDDED

        default 4
        help
          This is the maximum number of IDE hardware interfaces that will
        default 4
        help
          This is the maximum number of IDE hardware interfaces that will


@@ -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


@@ -389,14 +403,6 @@ config BLK_DEV_RZ1000
          Linux. This may slow disk throughput by a few percent, but at least
          things will operate 100% reliably.
 
          Linux. This may slow disk throughput by a few percent, but at least
          things will operate 100% reliably.
 

-config BLK_DEV_SL82C105
-       tristate "Winbond SL82c105 support"
-       depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
-       help
-         If you have a Winbond SL82c105 IDE controller, say Y here to enable
-         special configuration for this chip. This is common on various CHRP
-         motherboards, but could be used elsewhere. If in doubt, say Y.
-

 config BLK_DEV_IDEDMA_PCI
        bool "Generic PCI bus-master DMA support"
        depends on PCI && BLK_DEV_IDEPCI
 config BLK_DEV_IDEDMA_PCI
        bool "Generic PCI bus-master DMA support"
        depends on PCI && BLK_DEV_IDEPCI


@@ -614,14 +620,10 @@ config BLK_DEV_PIIX
          the kernel to change PIO, DMA and UDMA speeds and to configure
          the chip to optimum performance.
 
          the kernel to change PIO, DMA and UDMA speeds and to configure
          the chip to optimum performance.
 

-config BLK_DEV_IT8172
-       bool "IT8172 IDE support"
-       depends on (MIPS_ITE8172 || MIPS_IVR)
+config BLK_DEV_IT8213
+       tristate "IT8213 IDE support"

        help
        help

-         Say Y here to support the on-board IDE controller on the Integrated
-         Technology Express, Inc. ITE8172 SBC.  Vendor page at
-         <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-         board at <http://www.mvista.com/partners/semiconductor/ite.html>.
+        This driver adds support for the ITE 8213 IDE controller.

 
 config BLK_DEV_IT821X
        tristate "IT821X IDE support"
 
 config BLK_DEV_IT821X
        tristate "IT821X IDE support"


@@ -721,6 +723,14 @@ config BLK_DEV_SIS5513
 
          Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>.
 
 
          Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>.
 

+config BLK_DEV_SL82C105
+       tristate "Winbond SL82c105 support"
+       depends on (PPC || ARM)
+       help
+         If you have a Winbond SL82c105 IDE controller, say Y here to enable
+         special configuration for this chip. This is common on various CHRP
+         motherboards, but could be used elsewhere. If in doubt, say Y.
+

 config BLK_DEV_SLC90E66
        tristate "SLC90E66 chipset support"
        help
 config BLK_DEV_SLC90E66
        tristate "SLC90E66 chipset support"
        help


@@ -751,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.
 
          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
 endif
 
 config BLK_DEV_IDE_PMAC


@@ -805,7 +820,7 @@ endchoice
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"
 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)
 
 config IDE_ARM
        def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)