Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv9425/arch/mips
Modified Files:
config.in
Log Message:
Sync with OSS.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- config.in 2 Apr 2002 22:59:38 -0000 1.92
+++ config.in 21 Apr 2002 18:03:11 -0000 1.93
@@ -3,6 +3,7 @@
# see Documentation/kbuild/config-language.txt.
#
define_bool CONFIG_MIPS y
+define_bool CONFIG_MIPS32 y
mainmenu_name "Linux Kernel Configuration"
@@ -116,6 +117,8 @@
define_bool CONFIG_SBUS n
if [ "$CONFIG_DECSTATION" = "y" ]; then
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NONCOHERENT_IO y
fi
@@ -170,8 +173,8 @@
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_MIPS_ATLAS" = "y" ]; then
- define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PCI y
define_bool CONFIG_SWAP_IO_SPACE y
@@ -712,7 +715,10 @@
source drivers/block/Config.in
if [ "$CONFIG_BLK_DEV_INITRD" = "y" ]; then
+ mainmenu_option next_comment
+ comment 'MIPS initrd options'
bool ' Embed root filesystem ramdisk into the kernel' CONFIG_EMBEDDED_RAMDISK
+ endmenu
fi
source drivers/md/Config.in
|
