public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Carl-Daniel Hailfinger <c-d.hailfinger.kernel.2003@gmx.net>
To: Marcelo Tosatti <marcelo@conectiva.com.br>
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: [PATCH] IDE config correctness (was: Linux 2.4.21-rc5)
Date: Wed, 28 May 2003 00:35:55 +0200	[thread overview]
Message-ID: <3ED3E84B.9020505@gmx.net> (raw)
In-Reply-To: <Pine.LNX.4.55L.0305271640320.9487@freak.distro.conectiva>

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

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

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

===== 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

  parent reply	other threads:[~2003-05-27 22:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-05-27 19:41 Linux 2.4.21-rc5 Marcelo Tosatti
2003-05-27 20:53 ` Alex Romosan
2003-05-27 20:36   ` Alan Cox
2003-05-27 21:53   ` Marcelo Tosatti
2003-05-27 22:35 ` Carl-Daniel Hailfinger [this message]
2003-05-28  5:46 ` Linux 2.4.21-rc5: [RESENT PATCH] kernel with Old ide hard disk only support doesn't build Jerome Chantelauze
2003-05-28  8:10 ` Linux 2.4.21-rc5 Olaf Dietrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3ED3E84B.9020505@gmx.net \
    --to=c-d.hailfinger.kernel.2003@gmx.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo@conectiva.com.br \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox