lkml.org 
[lkml]   [2003]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] 2.4.24-pre1: ask for CONFIG_INDYDOG only on mips
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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.069 / U:1.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site