--- zzzz-none-000/linux-2.4.17/drivers/ide/Config.in	2001-10-08 18:40:13.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/ide/Config.in	2004-11-24 13:23:46.000000000 +0000
@@ -72,6 +72,10 @@
 	       dep_mbool '    IT8172 IDE support' CONFIG_BLK_DEV_IT8172 $CONFIG_BLK_DEV_IDEDMA_PCI
 	       dep_mbool '      IT8172 IDE Tuning support' CONFIG_IT8172_TUNING $CONFIG_BLK_DEV_IT8172 $CONFIG_IDEDMA_PCI_AUTO
 	    fi
+	    if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then
+	       dep_mbool '    IT8172 IDE support' CONFIG_BLK_DEV_IT8172 $CONFIG_BLK_DEV_IDEDMA_PCI
+	       dep_mbool '      IT8172 IDE Tuning support' CONFIG_IT8172_TUNING $CONFIG_BLK_DEV_IT8172 $CONFIG_IDEDMA_PCI_AUTO
+	    fi
 	    dep_bool '    NS87415 chipset support (EXPERIMENTAL)' CONFIG_BLK_DEV_NS87415 $CONFIG_BLK_DEV_IDEDMA_PCI
 	    dep_bool '    OPTi 82C621 chipset enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621 $CONFIG_EXPERIMENTAL
 	    dep_bool '    PROMISE PDC202{46|62|65|67|68} support' CONFIG_BLK_DEV_PDC202XX $CONFIG_BLK_DEV_IDEDMA_PCI
@@ -101,6 +105,11 @@
 	   define_bool CONFIG_BLK_DEV_IDEPCI $CONFIG_BLK_DEV_IDEDMA_PMAC
 	 fi
       fi
+
+      if [ "$CONFIG_REDWOOD_4" = "y" ] ; then
+	 bool '  STB3xxx IDE support ' CONFIG_BLK_DEV_REDWOOD_IDE
+      fi
+
       if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
 	 dep_bool '    ICS IDE interface support' CONFIG_BLK_DEV_IDE_ICSIDE $CONFIG_ARCH_ACORN
 	 dep_bool '      ICS DMA support' CONFIG_BLK_DEV_IDEDMA_ICS $CONFIG_BLK_DEV_IDE_ICSIDE
@@ -121,6 +130,9 @@
       if [ "$CONFIG_MAC" = "y" ]; then
 	 dep_bool '  Macintosh Quadra/Powerbook IDE interface support' CONFIG_BLK_DEV_MAC_IDE $CONFIG_MAC
       fi
+      if [ "$CONFIG_CPCI405" = "y" ]; then
+	 dep_bool '  CPCI-405 IDE interface support' CONFIG_BLK_DEV_CPCI405_IDE $CONFIG_CPCI405
+      fi
       if [ "$CONFIG_Q40" = "y" ]; then
 	 dep_bool '  Q40/Q60 IDE interface support' CONFIG_BLK_DEV_Q40IDE $CONFIG_Q40
       fi
@@ -168,7 +180,8 @@
    bool '  IGNORE word93 Validation BITS' CONFIG_IDEDMA_IVB
 fi
 
-if [ "$CONFIG_BLK_DEV_TIVO" = "y" ]; then
+if [ "$CONFIG_BLK_DEV_TIVO" = "y"  -o \
+     "$CONFIG_BLK_DEV_REDWOOD_IDE" = "y" ]; then
   define_bool CONFIG_DMA_NONPCI y
 else
   define_bool CONFIG_DMA_NONPCI n
@@ -193,6 +206,7 @@
      "$CONFIG_BLK_DEV_SLC90E66" = "y" -o \
      "$CONFIG_BLK_DEV_SL82C105" = "y" -o \
      "$CONFIG_BLK_DEV_VIA82CXXX" = "y" -o \
+     "$CONFIG_STB03xxx" = "y" -o \
      "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" ]; then
    define_bool CONFIG_BLK_DEV_IDE_MODES y
 else