From: Adrian Bunk <bunk@fs.tum.de>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>, ralf@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Subject: [patch] 2.4.24-pre1: ask for CONFIG_INDYDOG only on mips
Date: Wed, 10 Dec 2003 21:46:28 +0100 [thread overview]
Message-ID: <20031210204628.GA9103@fs.tum.de> (raw)
In-Reply-To: <Pine.LNX.4.44.0312101417080.1546-100000@logos.cnet>
On Wed, Dec 10, 2003 at 02:23:14PM -0200, Marcelo Tosatti wrote:
>...
> Summary of changes from v2.4.23 to v2.4.24-pre1
> ============================================
>...
> Ralf Bächle:
>...
> o MIPS char driver update
>...
This change contains the following bogus change for
drivers/char/Config.in:
...
@@ -237,9 +251,6 @@
tristate ' Eurotech CPU-1220/1410 Watchdog Timer' CONFIG_EUROTECH_WDT
tristate ' IB700 SBC Watchdog Timer' CONFIG_IB700_WDT
tristate ' ICP ELectronics Wafer 5823 Watchdog' CONFIG_WAFER_WDT
- if [ "$CONFIG_SGI_IP22" = "y" ]; then
- dep_tristate ' Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
- fi
tristate ' Intel i810 TCO timer / Watchdog' CONFIG_I810_TCO
tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD
tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
@@ -256,6 +267,7 @@
fi
fi
tristate ' ZF MachZ Watchdog' CONFIG_MACHZ_WDT
+ dep_tristate ' Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
dep_tristate ' AMD 766/768 TCO Timer/Watchdog' CONFIG_AMD7XX_TCO $CONFIG_EXPERIMENTAL
fi
endmenu
...
A dependency on a possibly undefined variable doesn't work with the 2.4
config system, and "make oldconfig" asks me on i386 for CONFIG_INDYDOG.
The following patch fixes it:
--- linux-2.4.24-pre1-full/drivers/char/Config.in.old 2003-12-10 18:48:40.000000000 +0100
+++ linux-2.4.24-pre1-full/drivers/char/Config.in 2003-12-10 18:51:15.000000000 +0100
@@ -267,7 +267,9 @@
fi
fi
tristate ' ZF MachZ Watchdog' CONFIG_MACHZ_WDT
- dep_tristate ' Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
+ if [ "$CONFIG_SGI_IP22" = "y" ]; then
+ dep_tristate ' Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
+ fi
dep_tristate ' AMD 766/768 TCO Timer/Watchdog' CONFIG_AMD7XX_TCO $CONFIG_EXPERIMENTAL
fi
endmenu
cu
Adrian
BTW: Why does this mips patch remove the i386 Mwave support option
from drivers/char/Config.in ?
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
next prev parent reply other threads:[~2003-12-10 20:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-10 16:23 Linux 2.4.24-pre1 Marcelo Tosatti
2003-12-10 20:46 ` Adrian Bunk [this message]
2003-12-11 22:58 ` [patch] 2.4.24-pre1: ask for CONFIG_INDYDOG only on mips Ralf Baechle
2003-12-12 21:31 ` Adrian Bunk
2003-12-12 22:30 ` Ralf Baechle
2003-12-10 21:47 ` Accept ReiserFS Data Logging? was: Linux 2.4.24-pre1 Mike Fedyk
2003-12-11 12:18 ` Marcelo Tosatti
2003-12-11 12:38 ` Hans Reiser
2003-12-11 21:11 ` Mike Fedyk
2003-12-10 23:03 ` Linux 2.4.24-pre1: failure in scsi/pcmcia Eyal Lebedinsky
2003-12-12 21:45 ` Linux 2.4.24-pre1 Marcel Holtmann
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=20031210204628.GA9103@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
--cc=ralf@linux-mips.org \
/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