rpms/kernel-xen/devel/configs config-generic, 1.6, 1.7 config-ia64-generic, 1.4, 1.5 config-powerpc-generic, 1.4, 1.5 config-powerpc32-generic, 1.3, 1.4 config-s390-generic, 1.3, 1.4

[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-serv21666/configs

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-powerpc32-generic config-s390-generic 
Log Message:
rebase on rawhide 1.1927


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-generic	7 Feb 2006 00:45:16 -0000	1.6
+++ config-generic	10 Feb 2006 03:25:21 -0000	1.7
@@ -1529,6 +1529,7 @@
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-ia64-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-ia64-generic	10 Feb 2006 03:25:21 -0000	1.5
@@ -47,6 +47,7 @@
 #
 # IDE chipset support/bugfixes
 #
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_SGIIOC4=m
 
 #


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-powerpc-generic	10 Feb 2006 03:25:21 -0000	1.5
@@ -40,6 +40,7 @@
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM112=m
 CONFIG_I2C_POWERMAC=y
 CONFIG_APPLE_AIRPORT=m
 CONFIG_SERIAL_PMACZILOG=m


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc32-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc32-generic	26 Jan 2006 22:14:35 -0000	1.3
+++ config-powerpc32-generic	10 Feb 2006 03:25:21 -0000	1.4
@@ -63,8 +63,5 @@
 
 # CONFIG_CRASH is not set
 
-# drivers/media/video/cx25840/cx25840.ko needs unknown symbol __ucmpdi2
-# CONFIG_VIDEO_DECODER is not set
-
 # CONFIG_HVC_RTAS is not set
 # CONFIG_MAMBO is not set


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-s390-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-s390-generic	10 Feb 2006 02:57:43 -0000	1.3
+++ config-s390-generic	10 Feb 2006 03:25:21 -0000	1.4
@@ -27,6 +27,7 @@
 CONFIG_CMM=y
 # CONFIG_CMM_PROC is not set
 CONFIG_VIRT_TIMER=y
+CONFIG_DASD_EER=m
 CONFIG_DASD_CMB=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=m
@@ -175,3 +176,5 @@
 
 # Breaks qeth (Feb 8th 2006)
 # CONFIG_DEBUG_SLAB is not set
+
+# CONFIG_BOOT_DELAY is not set