rpms/kernel/devel/configs config-generic, 1.50, 1.51 config-ia64-generic, 1.11, 1.12 config-x86-generic, 1.13, 1.14 config-x86_64-generic, 1.15, 1.16

Fri Sep 2 19:28:07 UTC 2005

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:
Coming soon to theatres near you..

git3 -- The rebase from hell.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51

--- config-generic	27 Aug 2005 17:41:45 -0000	1.50
+++ config-generic	2 Sep 2005 19:28:04 -0000	1.51
@@ -577,6 +577,7 @@
 CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -637,6 +638,9 @@
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -645,16 +649,9 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_TARGET_CONNMARK=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -678,21 +675,17 @@
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_DCCP=m
+CONFIG_IP_NF_MATCH_CONNBYTES=m
+CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_TARGET_CONNMARK=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
@@ -701,13 +694,29 @@
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
 
 #
 # IPv6: Netfilter Configuration
@@ -733,7 +742,8 @@
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_TARGET_MARK=m
 CONFIG_IP6_NF_RAW=m
-
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_HL=m
 
 #
 # Bridge: Netfilter Configuration
@@ -790,6 +800,10 @@
 CONFIG_NET_DIVERT=y
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
+CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
 # QoS and/or fair queueing
@@ -891,6 +905,13 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+CONFIG_PHYLIB=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_PHYCONTROL=y
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -919,7 +940,6 @@
 CONFIG_DE2104X=m
 CONFIG_TULIP=m
 # CONFIG_TULIP_NAPI is not set
-
 # CONFIG_TULIP_MWI is not set
 CONFIG_TULIP_MMIO=y
 # CONFIG_NI5010 is not set
@@ -928,6 +948,7 @@
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_ULI526X=m
 # CONFIG_AT1700 is not set
 CONFIG_DEPCA=m
 # CONFIG_HP100 is not set
@@ -971,6 +992,7 @@
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_EPIC100=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -1009,6 +1031,8 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 # CONFIG_2BUFF_MODE is not set
+CONFIG_CHELSIO_T1=m
+
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1050,12 +1074,11 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211_CRYPT is not set
-# CONFIG_IEEE80211_WPA is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW_DEBUG is not set
 # CONFIG_IPW2100_PROMISC is not set
@@ -1079,6 +1102,12 @@
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
 
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+
 #
 # Token Ring devices
 #
@@ -1638,6 +1667,7 @@
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
 
@@ -2540,4 +2570,3 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_INOTIFY=y
-


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-ia64-generic	26 Aug 2005 05:05:45 -0000	1.11
+++ config-ia64-generic	2 Sep 2005 19:28:04 -0000	1.12
@@ -149,3 +149,16 @@
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 CONFIG_KPROBES=y
 
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+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_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+
+CONFIG_IA64_ACPI_CPUFREQ=m
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-x86-generic	26 Aug 2005 08:21:43 -0000	1.13
+++ config-x86-generic	2 Sep 2005 19:28:04 -0000	1.14
@@ -241,8 +241,8 @@
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2100_PROMISC=y
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2200=m
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-x86_64-generic	29 Aug 2005 01:26:18 -0000	1.15
+++ config-x86_64-generic	2 Sep 2005 19:28:04 -0000	1.16
@@ -110,9 +110,8 @@
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2100_PROMISC=y
-# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2200=m
 
 CONFIG_PNP=y


