rpms/kernel/devel/configs config-generic, 1.177, 1.178 config-ia64-generic, 1.24, 1.25 config-x86-generic, 1.49, 1.50 config-x86_64-generic, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:
- Enable DECNET to keep both users happy. (#120628)
- Enable TPM modules. (#189020)
- Enable some SGI specific ia64 options. (#188915)
- Add missing -kdump %preuninstall (#189100)




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- config-generic	16 Apr 2006 22:58:48 -0000	1.177
+++ config-generic	18 Apr 2006 21:09:21 -0000	1.178
@@ -626,7 +626,6 @@
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 
-
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -635,7 +634,10 @@
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_DECNET is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_DECNET_ROUTE_FWMARK=y
+# CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
@@ -1410,9 +1412,9 @@
 # CONFIG_STALDRV is not set
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCG_NSC is not set
-# CONFIG_TCG_ATMEL is not set
+CONFIG_TCG_TPM=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set
 # CONFIG_TELCLOCK is not set
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-ia64-generic	16 Apr 2006 22:58:48 -0000	1.24
+++ config-ia64-generic	18 Apr 2006 21:09:21 -0000	1.25
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
- 
+
 #
 # Processor type and features
 #
@@ -36,7 +36,7 @@
 # CONFIG_MMTIMER is not set
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_IA32_SUPPORT is not set
 # CONFIG_COMPAT is not set
 CONFIG_PERFMON=y
@@ -95,11 +95,11 @@
 #
 # CONFIG_MTD is not set
 
-# 
+#
 # SGI
-# 
+#
 CONFIG_SGI_SNSC=y
-# CONFIG_IA64_SGI_SN_XP is not set
+CONFIG_IA64_SGI_SN_XP=y
 
 #
 # SCSI low-level drivers


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- config-x86-generic	10 Apr 2006 19:14:07 -0000	1.49
+++ config-x86-generic	18 Apr 2006 21:09:21 -0000	1.50
@@ -290,4 +290,4 @@
 
 CONFIG_SND_ES18XX=m
 
-
+CONFIG_TCG_INFINEON=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86_64-generic	10 Apr 2006 18:41:28 -0000	1.39
+++ config-x86_64-generic	18 Apr 2006 21:09:21 -0000	1.40
@@ -158,3 +158,5 @@
 CONFIG_REORDER=y
 
 CONFIG_SCHED_MC=y
+
+CONFIG_TCG_INFINEON=m