rpms/kernel/devel/configs config-generic, 1.75, 1.76 config-ppc-generic, 1.35, 1.36 config-ppc64, 1.7, 1.8 config-ppc64-generic, 1.19, 1.20 config-ppc64-iseries, 1.3, 1.4

Tue Nov 8 10:25:48 UTC 2005

Author: dwmw2

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

Modified Files:
	config-generic config-ppc-generic config-ppc64 
	config-ppc64-generic config-ppc64-iseries 
Log Message:
Do the -git11 merge since it's largely ppc again, and a few mtd bits


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76

--- config-generic	8 Nov 2005 03:41:12 -0000	1.75
+++ config-generic	8 Nov 2005 10:25:44 -0000	1.76
@@ -140,7 +140,7 @@
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_INFTL=m
-
+CONFIG_RFD_FTL=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -204,6 +204,7 @@
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_ONENAND is not set
 
 CONFIG_MTD_REDBOOT_PARTS=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -216,7 +217,8 @@
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
 
 #
 # Parallel port support


Index: config-ppc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-ppc-generic	8 Nov 2005 04:03:34 -0000	1.35
+++ config-ppc-generic	8 Nov 2005 10:25:44 -0000	1.36
@@ -10,6 +10,7 @@
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_DEBUGGER=y
+CONFIG_KPROBES=y
 
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_HIGHMEM is not set
@@ -209,3 +210,4 @@
 
 CONFIG_CAPI_EICON=y
 
+# CONFIG_WINDFARM is not set


Index: config-ppc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-ppc64	5 Nov 2005 17:42:34 -0000	1.7
+++ config-ppc64	8 Nov 2005 10:25:44 -0000	1.8
@@ -38,9 +38,27 @@
 CONFIG_APPLE_AIRPORT=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM81=y
+CONFIG_WINDFARM_PM91=y
 # CONFIG_SCSI_MAC53C94 is not set
 # CONFIG_PMAC_BACKLIGHT is not set
 CONFIG_IBMVETH=m
 CONFIG_I2C_KEYWEST=y
 # CONFIG_PARPORT_PC is not set
 CONFIG_SPIDER_NET=m
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_PMAC64=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_PMAC=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-ppc64-generic	8 Nov 2005 03:28:59 -0000	1.19
+++ config-ppc64-generic	8 Nov 2005 10:25:44 -0000	1.20
@@ -13,6 +13,7 @@
 CONFIG_PROC_DEVICETREE=y
 CONFIG_NUMA=y
 CONFIG_DISCONTIGMEM=y
+CONFIG_KPROBES=y
 
 #
 # General setup


Index: config-ppc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-iseries,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-ppc64-iseries	21 Sep 2005 01:11:25 -0000	1.3
+++ config-ppc64-iseries	8 Nov 2005 10:25:44 -0000	1.4
@@ -52,3 +52,5 @@
 # drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do'
 # drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function
 # CONFIG_INFINIBAND_MTHCA is not set
+
+# CONFIG_WINDFARM is not set


