Messages in this thread Patch in this message | | | Date | Wed, 28 May 2003 00:35:55 +0200 | From | Carl-Daniel Hailfinger <> | Subject | [PATCH] IDE config correctness (was: Linux 2.4.21-rc5) |
| |
Marcelo Tosatti wrote: > Summary of changes from v2.4.21-rc4 to v2.4.21-rc5 > ============================================ > > Alan Cox <alan@lxorguk.ukuu.org.uk>: > o 1: (trivial) Fix the formatting of your ide hack
Darn. Everytime I send a patch for drivers/ide/Config.in, someone beats me to it and my patch causes a conflict. This time with one more bugfix for the same line.
Fixes: CONFIG_PDC202XX_BURST was not selectable if CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_PDC202XX_BURST depended on CONFI_BLK_DEV_IDEDMA_PCI, which is a typo.
Please apply,
Carl-Daniel ===== drivers/ide/Config.in 1.32 vs edited ===== --- 1.32/drivers/ide/Config.in Tue May 27 15:24:35 2003 +++ edited/drivers/ide/Config.in Wed May 28 00:28:21 2003 @@ -63,7 +63,7 @@ dep_tristate ' NS87415 chipset support' CONFIG_BLK_DEV_NS87415 $CONFIG_BLK_DEV_IDEDMA_PCI dep_tristate ' OPTi 82C621 chipset enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621 $CONFIG_EXPERIMENTAL dep_tristate ' PROMISE PDC202{46|62|65|67} support' CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI - dep_bool ' Special UDMA Feature' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD $CONFI_BLK_DEV_IDEDMA_PCI + dep_mbool ' Special UDMA Feature' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI dep_tristate ' PROMISE PDC202{68|69|70|71|75|76|77} support' CONFIG_BLK_DEV_PDC202XX_NEW $CONFIG_BLK_DEV_IDEDMA_PCI if [ "$CONFIG_BLK_DEV_PDC202XX_OLD" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_OLD" = "m" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "m" ]; then bool ' Special FastTrak Feature' CONFIG_PDC202XX_FORCE | |