Messages in this thread Patch in this message | | | Date | Thu, 28 Oct 1999 16:25:34 +0200 (MET_DST) | From | David Weinehall <> | Subject | A couple of config.in fixes... |
| |
This fixes a couple of config.in errors, and moves the 'Code Maturity' and 'Module Support' menus to the main-menu in PPC, to make it consistent with the other platforms.
/David Weinehall _ _ // David Weinehall <tao@acc.umu.se> /> Northern lights wander \\ // Project MCA Linux hacker // Dance across the winter sky // \> http://www.acc.umu.se/~tao/ </ Full colour fire </
diff -u -r linux-2.3.24/arch/arm/config.in linux-2.3.24dw/arch/arm/config.in --- linux-2.3.24/arch/arm/config.in Mon Oct 25 19:51:31 1999 +++ linux-2.3.24dw/arch/arm/config.in Thu Oct 28 14:05:10 1999 @@ -21,6 +21,7 @@ EBSA-110 CONFIG_ARCH_EBSA110 \ FootBridge-based CONFIG_FOOTBRIDGE" RiscPC # SA1100-based CONFIG_ARCH_SA1100 + if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then bool 'FootBridge in HOST mode' CONFIG_HOST_FOOTBRIDGE if [ "$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then @@ -45,13 +46,13 @@ if [ "$CONFIG_ARCH_SA1100" = "y" ]; then define_bool CONFIG_CPU_SA1100 y choice 'SA1100 implementation' \ - "Brutus CONFIG_SA1100_BRUTUS \ - empeg CONFIG_SA1100_EMPEG \ - Itsy CONFIG_SA1100_ITSY \ - LART CONFIG_SA1100_LART \ - PLEB CONFIG_SA1100_PLEB \ - Victor CONFIG_SA1100_VICTOR \ - Tifon CONFIG_SA1100_TIFON" Brutus + "Brutus CONFIG_SA1100_BRUTUS \ + Empeg CONFIG_SA1100_EMPEG \ + Itsy CONFIG_SA1100_ITSY \ + LART CONFIG_SA1100_LART \ + PLEB CONFIG_SA1100_PLEB \ + Victor CONFIG_SA1100_VICTOR \ + Tifon CONFIG_SA1100_TIFON" Brutus fi # @@ -120,8 +121,6 @@ else define_bool CONFIG_ISA_DMA n fi - -endmenu if [ "$CONFIG_CPU_32" = "y" -a "$CONFIG_ARCH_EBSA110" != "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'Enable kernel-mode alignment trap handler (EXPERIMENTAL)' CONFIG_ALIGNMENT_TRAP diff -u -r linux-2.3.24/arch/mips/config.in linux-2.3.24dw/arch/mips/config.in --- linux-2.3.24/arch/mips/config.in Thu Oct 7 19:17:08 1999 +++ linux-2.3.24dw/arch/mips/config.in Thu Oct 28 14:14:16 1999 @@ -177,13 +177,12 @@ if [ "$CONFIG_SGI" = "y" ]; then bool ' SGI Seeq ethernet controller support' CONFIG_SGISEEQ fi - if [ "$CONFIG_DECSTATION" = "y" ]; then - bool ' DEC LANCE ethernet controller support' CONFIG_DECLANCE - fi - if [ "$CONFIG_BAGET_MIPS" = "y" ]; then - tristate ' Baget AMD LANCE support' CONFIG_BAGETLANCE - tristate ' Baget Backplane Shared Memory support' CONFIG_BAGETBSM - fi + if [ "$CONFIG_DECSTATION" = "y" ]; then + bool ' DEC LANCE ethernet controller support' CONFIG_DECLANCE + fi + if [ "$CONFIG_BAGET_MIPS" = "y" ]; then + tristate ' Baget AMD LANCE support' CONFIG_BAGETLANCE + tristate ' Baget Backplane Shared Memory support' CONFIG_BAGETBSM fi fi endmenu @@ -206,7 +205,7 @@ mainmenu_option next_comment - comment comment 'Old CD-ROM drivers (not SCSI, not IDE)' + comment 'Old CD-ROM drivers (not SCSI, not IDE)' bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then diff -u -r linux-2.3.24/arch/ppc/config.in linux-2.3.24dw/arch/ppc/config.in --- linux-2.3.24/arch/ppc/config.in Tue Oct 12 19:00:58 1999 +++ linux-2.3.24dw/arch/ppc/config.in Thu Oct 28 15:57:37 1999 @@ -5,6 +5,11 @@ mainmenu_name "Linux/PowerPC Kernel Configuration" mainmenu_option next_comment +comment 'Code maturity level options' +bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL +endmenu + +mainmenu_option next_comment comment 'Platform support' define_bool CONFIG_PPC y choice 'Processor type' \ @@ -53,14 +58,16 @@ endmenu mainmenu_option next_comment -comment 'General setup' - -bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL +comment 'Loadable module support' bool 'Enable loadable module support' CONFIG_MODULES if [ "$CONFIG_MODULES" = "y" ]; then - bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool 'Kernel module loader' CONFIG_KMOD + bool ' Set version information on all module symbols' CONFIG_MODVERSIONS + bool ' Kernel module loader' CONFIG_KMOD fi +endmenu + +mainmenu_option next_comment +comment 'General setup' if [ "$CONFIG_APUS" = "y" ]; then define_bool CONFIG_PCI n
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |