From: James S. <jsi...@us...> - 2002-04-24 18:56:54
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/arm In directory usw-pr-cvs1:/tmp/cvs-serv8328/linux/arch/arm Modified Files: config.in Log Message: Synced to 2.5.9. Note some of the fb changes went into 2.5.9. Yeah :-) Index: config.in =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/arm/config.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- config.in 16 Apr 2002 17:41:46 -0000 1.23 +++ config.in 24 Apr 2002 18:56:49 -0000 1.24 @@ -433,6 +433,12 @@ define_bool CONFIG_FIQ n fi +# Compressed boot loader in ROM. Yes, we really want to ask about +# TEXT and BSS so we preserve their values in the config files. +bool 'Compressed boot loader in ROM/flash' CONFIG_ZBOOT_ROM +hex 'Compressed ROM boot loader base address' CONFIG_ZBOOT_ROM_TEXT 0 +hex 'Compressed ROM boot loader BSS address' CONFIG_ZBOOT_ROM_BSS 0 + if [ "$CONFIG_ARCH_SA1100" = "y" -o \ "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then dep_bool 'Support CPU clock change (EXPERIMENTAL)' CONFIG_CPU_FREQ $CONFIG_EXPERIMENTAL @@ -573,14 +579,7 @@ source drivers/message/i2o/Config.in -mainmenu_option next_comment -comment 'ISDN subsystem' - -tristate 'ISDN support' CONFIG_ISDN -if [ "$CONFIG_ISDN" != "n" ]; then - source drivers/isdn/Config.in -fi -endmenu +source drivers/isdn/Config.in # # input before char - char/joystick depends on it. As does USB. |