rpms/kernel/devel/configs config-generic,1.125,1.126

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-generic 
Log Message:
git5



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- config-generic	8 Jan 2006 01:59:04 -0000	1.125
+++ config-generic	9 Jan 2006 18:55:15 -0000	1.126
@@ -670,6 +670,7 @@
 CONFIG_IP_NF_MATCH_DCCP=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CONNMARK=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -731,6 +732,7 @@
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -1370,12 +1372,13 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
-CONFIG_N_HDLC=m
-CONFIG_STALDRV=y
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_STALDRV is not set
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_TCG_TPM is not set
@@ -2501,7 +2504,7 @@
 # CONFIG_TUX_DEBUG is not set
 
 CONFIG_CPUSETS=y
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 
 CONFIG_DETECT_SOFTLOCKUP=y