Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
  ide-acpi support warning fix
  ACPI support for IDE devices
  IDE Driver for Delkin/Lexar/etc.. cardbus CF adapter
  ide: it8213 IDE driver update (version 2)
  ide: add it8213 IDE driver
  tc86c001: add missing __init tag for tc86c001_ide_init()
  tc86c001: mark init_chipset_tc86c001() with __devinit tag
  tc86c001: init_hwif_tc86c001() can be static
  ide: add Toshiba TC86C001 IDE driver (take 2)
  pdc202xx_new: remove check_in_drive_lists abomination
  pdc202xx_new: remove useless code
  slc90e66: carry over fixes from piix driver
  piix: tuneproc() fixes/cleanups
  piix: fix 82371MX enablebits
  hpt366: HPT36x PCI clock detection fix
  hpt366: init code rewrite
  hpt366: clean up DMA timeout handling for HPT370
  hpt366: merge HPT37x speedproc handlers
  hpt366: cache channel's MCR address
  hpt366: switch to using pci_get_slot
  ...

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3f828052f8d2..ec03341d2bd8 100644
--- 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