rpms/kernel/devel/configs config-generic, 1.132, 1.133 config-powerpc-generic, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	config-generic config-powerpc-generic 
Log Message:
git10


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- config-generic	13 Jan 2006 22:58:19 -0000	1.132
+++ config-generic	14 Jan 2006 09:51:58 -0000	1.133
@@ -632,6 +632,30 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -799,6 +823,13 @@
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+
+#
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-powerpc-generic	13 Jan 2006 22:58:19 -0000	1.12
+++ config-powerpc-generic	14 Jan 2006 09:51:58 -0000	1.13
@@ -80,8 +80,3 @@
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 
-# 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
-