rpms/kernel/devel/configs config-generic, 1.126, 1.127 config-powerpc-generic, 1.8, 1.9 config-powerpc64, 1.8, 1.9

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 10 01:46:06 UTC 2006


Author: dwmw2

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

Modified Files:
	config-generic config-powerpc-generic config-powerpc64 
Log Message:
PowerPC update from git tree


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- config-generic	9 Jan 2006 18:55:15 -0000	1.126
+++ config-generic	10 Jan 2006 01:46:00 -0000	1.127
@@ -1631,6 +1631,7 @@
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
 
 #
 # Video For Linux
@@ -1650,6 +1651,7 @@
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_DECODER=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
@@ -1746,6 +1748,7 @@
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_DIGITV=m
@@ -2018,7 +2021,12 @@
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
 CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
+
+# WACOM disabled 2006-01-10 dwmw2:
+# drivers/usb/input/wacom.c:98: error: redeclaration of enumerator ‘G4’
+# include/asm/cputable.h:37: error: previous definition of ‘G4’ was here
+# CONFIG_USB_WACOM is not set
+
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
 CONFIG_USB_XPAD=m


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-powerpc-generic	30 Dec 2005 05:09:24 -0000	1.8
+++ config-powerpc-generic	10 Jan 2006 01:46:00 -0000	1.9
@@ -1,4 +1,5 @@
 # Most PowerPC kernels we build are SMP
+# CONFIG_CRASH_DUMP is not set 
 CONFIG_SMP=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
@@ -79,4 +80,3 @@
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_BUSLOGIC is not set
-


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-powerpc64	14 Dec 2005 14:36:31 -0000	1.8
+++ config-powerpc64	10 Jan 2006 01:46:00 -0000	1.9
@@ -1,11 +1,13 @@
 CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_PPC_PMAC64=y
-CONFIG_PPC_MAPLE=y
+# CONFIG_PPC_MAPLE is not set
 CONFIG_PPC_CELL=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
+CONFIG_IBMEBUS=y
+CONFIG_SPU_FS=m
 CONFIG_RTAS_FLASH=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=y




More information about the fedora-cvs-commits mailing list