rpms/kernel/devel/configs config-generic, 1.70, 1.71 config-ppc-generic, 1.29, 1.30 config-ppc64, 1.5, 1.6 config-ppc64-generic, 1.16, 1.17

Wed Nov 2 11:29:16 UTC 2005

Author: dwmw2

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

Modified Files:
	config-generic config-ppc-generic config-ppc64 
	config-ppc64-generic 
Log Message:
Merge -git5 and make powerpc stuff work


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71

--- config-generic	31 Oct 2005 03:03:29 -0000	1.70
+++ config-generic	2 Nov 2005 11:29:12 -0000	1.71
@@ -13,7 +13,6 @@
 CONFIG_CLEAN_COMPILE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-
 #
 # General setup
 #
@@ -35,6 +34,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_CFQ=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
@@ -1460,6 +1460,7 @@
 # CONFIG_TCG_NSC is not set
 # CONFIG_TCG_ATMEL is not set
 # CONFIG_TCG_INFINEON is not set
+CONFIG_TELCLOCK=m
 
 #
 # Serial drivers
@@ -2516,6 +2517,8 @@
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y


Index: config-ppc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-ppc-generic	16 Sep 2005 09:09:55 -0000	1.29
+++ config-ppc-generic	2 Nov 2005 11:29:12 -0000	1.30
@@ -3,6 +3,13 @@
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
+# CONFIG_PPC64 is not set
+CONFIG_RTAS_PROC=y
+# CONFIG_PCMCIA_M8XX is not set
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_WATCHDOG_RTAS=m
+CONFIG_DEBUGGER=y
+
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_HIGHMEM is not set
 
@@ -65,7 +72,7 @@
 # CONFIG_TQM8260 is not set
 CONFIG_PPC_CHRP=y
 CONFIG_PPC_PMAC=y
-CONFIG_PPC_PREP=y
+# CONFIG_PPC_PREP is not set
 CONFIG_PPC_OF=y
 CONFIG_PPCBUG_NVRAM=y
 
@@ -153,7 +160,7 @@
 CONFIG_FB_ATY_GX=y
 
 CONFIG_FB_ATY128=y
-CONFIG_NVRAM=y
+# CONFIG_NVRAM is not set
 
 # CONFIG_ISA is not set
 # CONFIG_ISAPNP is not set 


Index: config-ppc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-ppc64	16 Aug 2005 21:05:49 -0000	1.5
+++ config-ppc64	2 Nov 2005 11:29:12 -0000	1.6
@@ -6,7 +6,7 @@
 # CONFIG_HMT is not set
 CONFIG_DISCONTIGMEM=y
 CONFIG_PROC_DEVICETREE=y
-
+# CONFIG_PM is not set
 CONFIG_PPC_RTAS=y
 CONFIG_RTAS_FLASH=y
 CONFIG_RTAS_PROC=y
@@ -19,6 +19,8 @@
 CONFIG_PPC_OF=y
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PMAC64=y
+CONFIG_PPC_MAPLE=y
+CONFIG_PPC_BPA=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
@@ -41,3 +43,4 @@
 CONFIG_IBMVETH=m
 CONFIG_I2C_KEYWEST=y
 # CONFIG_PARPORT_PC is not set
+CONFIG_SPIDER_NET=m


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-ppc64-generic	18 Oct 2005 07:45:56 -0000	1.16
+++ config-ppc64-generic	2 Nov 2005 11:29:12 -0000	1.17
@@ -5,6 +5,12 @@
 CONFIG_PPC64=y
 CONFIG_NR_CPUS=64
 # CONFIG_POWER4_ONLY is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_IRQ_ALL_CPUS=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PCMCIA_M8XX is not set
+CONFIG_ALTIVEC=y
+CONFIG_PROC_DEVICETREE=y
 CONFIG_NUMA=y
 CONFIG_DISCONTIGMEM=y
 


