rpms/kernel/devel/configs config-generic,1.263,1.264

Mon Dec 4 16:39:43 UTC 2006

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv19974/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.263
retrieving revision 1.264
diff -u -r1.263 -r1.264

--- config-generic	30 Nov 2006 23:17:05 -0000	1.263
+++ config-generic	4 Dec 2006 16:39:41 -0000	1.264
@@ -628,6 +628,8 @@
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 
+CONFIG_TCP_MD5SIG=y
+
 #
 # Networking options
 #
@@ -716,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
@@ -726,6 +729,7 @@
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -754,6 +758,31 @@
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
 CONFIG_IP_NF_CONNTRACK_SECMARK=y
+
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_NETLINK=m
+
+
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_DSCP=m
@@ -886,6 +915,7 @@
 CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_NET_DCCPPROBE=m
 
@@ -1009,6 +1039,7 @@
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -1115,7 +1146,9 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
+CONFIG_NETXEN_NIC=m
 CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1722,7 +1755,9 @@
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
 # CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_CPU5_WDT is not set
 CONFIG_I6300ESB_WDT=m
@@ -2177,6 +2212,7 @@
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2350,6 +2386,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_DEBUG is not set
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2762,6 +2799,7 @@
 # CONFIG_TUX_DEBUG is not set
 
 CONFIG_CPUSETS=y
+# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 # CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set


