[PATCH] IDE config correctness (was: Linux 2.4.21-rc4)

[Carl-Daniel Hailfinger <c-d.hailfinger.kernel.2003@gmx.net>]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Marcelo Tosatti wrote:
> Hi,
> 
> Here goes -rc4, hopefully fixing all problems now.
> 
> rc5 will only be released in case of REALLY bad problems.

Not really a bad problem, but CONFIG_PDC202XX_BURST should be selectable
even if CONFIG_BLK_DEV_PDC202XX_OLD=m
You decide if this goes into 2.4.21. I do not feel strongly about it.

>   o Cset exclude: c-d.hailfinger.kernel.2003@gmx.net|ChangeSet|20030526190224|33683
>   o Really fix xconfig breakage

My fix for the xconfig breakage also included this IDE config fix. When
you excluded the cset, it got lost.

Attached is the diff on top of your tree.


Regards,
Carl-Daniel

[-- Attachment #2: ide-special-udma-feature.diff --]
[-- Type: text/plain, Size: 1121 bytes --]

===== drivers/ide/Config.in 1.31 vs edited =====
--- 1.31/drivers/ide/Config.in	Mon May 26 21:38:00 2003
+++ edited/drivers/ide/Config.in	Mon May 26 23:20:49 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 $CONFI_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
 		# FIXME - probably wants to be one for old and for new
 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