ia64/xen-unstable

changeset 3472:dbeb285e008c

bitkeeper revision 1.1159.223.9 (41f05020SfVtxET_96qMp22pZ-tmOA)

Update defconfig-xen0 for linux 2.4.29
author iap10@labyrinth.cl.cam.ac.uk
date Fri Jan 21 00:43:12 2005 +0000 (2005-01-21)
parents ed0d4ce83995
children 328aa630a53e
files linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0	Fri Jan 21 00:37:54 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0	Fri Jan 21 00:43:12 2005 +0000
     1.3 @@ -130,6 +130,7 @@ CONFIG_BLK_DEV_INITRD=y
     1.4  #
     1.5  # CONFIG_MD is not set
     1.6  # CONFIG_BLK_DEV_MD is not set
     1.7 +# CONFIG_IP_NF_NAT_LOCAL is not set
     1.8  # CONFIG_MD_LINEAR is not set
     1.9  # CONFIG_MD_RAID0 is not set
    1.10  # CONFIG_MD_RAID1 is not set
    1.11 @@ -161,6 +162,11 @@ CONFIG_IP_PNP_DHCP=y
    1.12  # CONFIG_SYN_COOKIES is not set
    1.13  
    1.14  #
    1.15 +# Appletalk devices
    1.16 +#
    1.17 +# CONFIG_DEV_APPLETALK is not set
    1.18 +
    1.19 +#
    1.20  #   IP: Netfilter Configuration
    1.21  #
    1.22  CONFIG_IP_NF_CONNTRACK=m
    1.23 @@ -188,6 +194,7 @@ CONFIG_IP_NF_MATCH_STATE=m
    1.24  CONFIG_IP_NF_MATCH_CONNTRACK=m
    1.25  # CONFIG_IP_NF_MATCH_UNCLEAN is not set
    1.26  # CONFIG_IP_NF_MATCH_OWNER is not set
    1.27 +CONFIG_IP_NF_MATCH_PHYSDEV=y
    1.28  CONFIG_IP_NF_FILTER=y
    1.29  CONFIG_IP_NF_TARGET_REJECT=y
    1.30  # CONFIG_IP_NF_TARGET_MIRROR is not set
    1.31 @@ -195,6 +202,7 @@ CONFIG_IP_NF_NAT=m
    1.32  CONFIG_IP_NF_NAT_NEEDED=y
    1.33  CONFIG_IP_NF_TARGET_MASQUERADE=m
    1.34  CONFIG_IP_NF_TARGET_REDIRECT=m
    1.35 +# CONFIG_IP_NF_NAT_LOCAL is not set
    1.36  # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
    1.37  CONFIG_IP_NF_NAT_IRC=m
    1.38  CONFIG_IP_NF_NAT_FTP=m
    1.39 @@ -224,8 +232,32 @@ CONFIG_VLAN_8021Q=y
    1.40  #
    1.41  # CONFIG_IPX is not set
    1.42  # CONFIG_ATALK is not set
    1.43 +
    1.44 +#
    1.45 +# Appletalk devices
    1.46 +#
    1.47 +# CONFIG_DEV_APPLETALK is not set
    1.48  # CONFIG_DECNET is not set
    1.49  CONFIG_BRIDGE=y
    1.50 +CONFIG_BRIDGE_NF_EBTABLES=m
    1.51 +CONFIG_BRIDGE_EBT_T_FILTER=m
    1.52 +CONFIG_BRIDGE_EBT_T_NAT=m
    1.53 +CONFIG_BRIDGE_EBT_BROUTE=m
    1.54 +CONFIG_BRIDGE_EBT_LOG=m
    1.55 +CONFIG_BRIDGE_EBT_IPF=m
    1.56 +CONFIG_BRIDGE_EBT_ARPF=m
    1.57 +CONFIG_BRIDGE_EBT_AMONG=m
    1.58 +CONFIG_BRIDGE_EBT_LIMIT=m
    1.59 +CONFIG_BRIDGE_EBT_VLANF=m
    1.60 +CONFIG_BRIDGE_EBT_802_3=m
    1.61 +CONFIG_BRIDGE_EBT_PKTTYPE=m
    1.62 +CONFIG_BRIDGE_EBT_STP=m
    1.63 +CONFIG_BRIDGE_EBT_MARKF=m
    1.64 +CONFIG_BRIDGE_EBT_ARPREPLY=m
    1.65 +CONFIG_BRIDGE_EBT_SNAT=m
    1.66 +CONFIG_BRIDGE_EBT_DNAT=m
    1.67 +CONFIG_BRIDGE_EBT_REDIRECT=m
    1.68 +CONFIG_BRIDGE_EBT_MARK_T=m
    1.69  # CONFIG_X25 is not set
    1.70  # CONFIG_LAPB is not set
    1.71  # CONFIG_LLC is not set
    1.72 @@ -395,7 +427,6 @@ CONFIG_AIC79XX_DEBUG_MASK=0
    1.73  CONFIG_SCSI_MEGARAID=y
    1.74  # CONFIG_SCSI_MEGARAID2 is not set
    1.75  CONFIG_SCSI_SATA=y
    1.76 -# CONFIG_SCSI_SATA_AHCI is not set
    1.77  # CONFIG_SCSI_SATA_SVW is not set
    1.78  CONFIG_SCSI_ATA_PIIX=y
    1.79  # CONFIG_SCSI_SATA_NV is not set