rpms/kernel/devel/configs config-generic, 1.60, 1.61 config-ppc64-generic, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-generic config-ppc64-generic 
Log Message:
doh. apply 6 days worth of missing patches.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-generic	21 Sep 2005 00:04:57 -0000	1.60
+++ config-generic	28 Sep 2005 02:35:30 -0000	1.61
@@ -531,6 +531,7 @@
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
+CONFIG_FUSION_SAS=m
 
 #
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
@@ -704,6 +705,8 @@
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_NFQUEUE=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
@@ -717,7 +720,6 @@
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_TFTP=m
@@ -749,12 +751,13 @@
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
 CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_MARK=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_NFQUEUE=m
 
 #
 # Bridge: Netfilter Configuration


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-ppc64-generic	16 Sep 2005 09:09:55 -0000	1.14
+++ config-ppc64-generic	28 Sep 2005 02:35:30 -0000	1.15
@@ -101,18 +101,18 @@
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 CONFIG_PMAC_SMU=y
 
-CONFIG_I2C_MPC=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
 CONFIG_MV643XX_ETH=m
 CONFIG_MV643XX_ETH_0=y
 CONFIG_MV643XX_ETH_1=y
 CONFIG_MV643XX_ETH_2=y
 
+CONFIG_I2C_MPC=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_PIIX4=m
+CONFIG_I2C_PMAC_SMU=m
 
 # CONFIG_PPC_BPA is not set
 CONFIG_WATCHDOG_RTAS=m