[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

[linux-2.6] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3ac0a535b4aa2a961bfbbbe4a4b133b294880cef..1cadd2c3caddce3ab3cb0d26bfc7160ad70e7d5c 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -606,6 +606,12 @@ 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"
+       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.
+
 config BLK_DEV_NS87415
        tristate "NS87415 chipset support"
        help
@@ -672,8 +678,8 @@ config BLK_DEV_SVWKS
          chipsets.
 
 config BLK_DEV_SGIIOC4
-       tristate "Silicon Graphics IOC4 chipset support"
-       depends on IA64_SGI_SN2 || IA64_GENERIC
+       tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
+       depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
        help
          This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
          chipset, which has one channel and can support two devices.
@@ -758,6 +764,7 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
 config BLK_DEV_IDEDMA_PMAC
        bool "PowerMac IDE DMA support"
        depends on BLK_DEV_IDE_PMAC
+       select BLK_DEV_IDEDMA_PCI
        help
          This option allows the driver for the built-in IDE controller on
          Power Macintoshes and PowerBooks to use DMA (direct memory access)