[Linuxconsole-commit]CVS: ruby/linux/arch/i386 config.in,1.29,1.30

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

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

Modified Files:
	config.in 
Log Message:
Synced to 2.5.0. Don't use. The default 2.5.0 has a nasty bug in it.

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/config.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- config.in	2001/11/13 19:38:21	1.29
+++ config.in	2001/12/26 17:28:10	1.30
@@ -234,8 +234,10 @@
 
 if [ "$CONFIG_HOTPLUG" = "y" ] ; then
    source drivers/pcmcia/Config.in
+   source drivers/hotplug/Config.in
 else
    define_bool CONFIG_PCMCIA n
+   define_bool CONFIG_HOTPLUG_PCI n
 fi
 
 bool 'System V IPC' CONFIG_SYSVIPC
@@ -254,6 +256,7 @@
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
+   
    if [ "$CONFIG_ACPI" != "n" ]; then
       source drivers/acpi/Config.in
    fi
@@ -274,10 +277,10 @@
 
 source drivers/mtd/Config.in
 
-source drivers/pnp/Config.in
-
 source drivers/parport/Config.in
 
+source drivers/pnp/Config.in
+
 source drivers/serial/Config.in
 
 source drivers/block/Config.in
@@ -358,7 +361,7 @@
 
 #
 # input before char - char/joystick depends on it. 
-#   
+#
 source drivers/usb/Config.in
 source drivers/input/Config.in
 source drivers/char/Config.in