rpms/kernel-xen/devel/configs config-generic, 1.5, 1.6 config-x86-generic, 1.6, 1.7 config-x86_64-generic, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: quintela

Update of /cvs/dist/rpms/kernel-xen/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28652/configs

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
merge with rawhide 1.914


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-generic	2 Feb 2006 14:04:31 -0000	1.5
+++ config-generic	7 Feb 2006 00:45:16 -0000	1.6
@@ -559,6 +559,7 @@
 # Networking support
 #
 CONFIG_NET=y
+# CONFIG_NETDEBUG is not set
 
 # CONFIG_TCP_CONG_ADVANCED is not set
 
@@ -1094,6 +1095,7 @@
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -2448,6 +2450,7 @@
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_RODATA is not set
+CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-x86-generic	31 Jan 2006 21:26:17 -0000	1.6
+++ config-x86-generic	7 Feb 2006 00:45:16 -0000	1.7
@@ -276,7 +276,7 @@
 CONFIG_CS5535_GPIO=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-x86_64-generic	26 Jan 2006 22:14:35 -0000	1.5
+++ config-x86_64-generic	7 Feb 2006 00:45:16 -0000	1.6
@@ -149,7 +149,7 @@
 CONFIG_NVRAM=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m