bitkeeper revision 1.1159.223.9 (41f05020SfVtxET_96qMp22pZ-tmOA)

Update defconfig-xen0 for linux 2.4.29

diff --git a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0
index ace090e76dd23a90f0866c1c245501e3774ed0ce..ca10b9ef7222cc2a2a61d2f4bcdf6172ded6d57e 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0
+++ b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0
@@ -130,6 +130,7 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_MD is not set
 # CONFIG_BLK_DEV_MD is not set
+# CONFIG_IP_NF_NAT_LOCAL is not set
 # CONFIG_MD_LINEAR is not set
 # CONFIG_MD_RAID0 is not set
 # CONFIG_MD_RAID1 is not set
@@ -160,6 +161,11 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 
+#
+# Appletalk devices
+#
+# CONFIG_DEV_APPLETALK is not set
+
 #
 #   IP: Netfilter Configuration
 #
@@ -188,6 +194,7 @@ CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 # CONFIG_IP_NF_MATCH_UNCLEAN is not set
 # CONFIG_IP_NF_MATCH_OWNER is not set
+CONFIG_IP_NF_MATCH_PHYSDEV=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 # CONFIG_IP_NF_TARGET_MIRROR is not set
@@ -195,6 +202,7 @@ CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_NAT_LOCAL is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_NAT_FTP=m
@@ -224,8 +232,32 @@ CONFIG_VLAN_8021Q=y
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
+
+#
+# Appletalk devices
+#
+# CONFIG_DEV_APPLETALK is not set
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=y
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_IPF=m
+CONFIG_BRIDGE_EBT_ARPF=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_VLANF=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_MARKF=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_LLC is not set
@@ -395,7 +427,6 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_SCSI_MEGARAID=y
 # CONFIG_SCSI_MEGARAID2 is not set
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 CONFIG_SCSI_ATA_PIIX=y
 # CONFIG_SCSI_SATA_NV is not set