[Linuxconsole-commit]CVS: ruby/linux/arch/cris config.in,1.10,1.11

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/cris
In directory usw-pr-cvs1:/tmp/cvs-serv8328/linux/arch/cris

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/cris/config.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config.in	22 Mar 2002 20:13:57 -0000	1.10
+++ config.in	24 Apr 2002 18:56:50 -0000	1.11
@@ -185,15 +185,7 @@
 
 source net/irda/Config.in
 
-mainmenu_option next_comment
-comment 'ISDN subsystem'
-if [ "$CONFIG_NET" != "n" ]; then
-   tristate 'ISDN support' CONFIG_ISDN
-   if [ "$CONFIG_ISDN" != "n" ]; then
-      source drivers/isdn/Config.in
-   fi
-fi
-endmenu
+source drivers/isdn/Config.in
 
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'