ia64/xen-unstable

changeset 3474:439f4f511898

bitkeeper revision 1.1159.223.11 (41f0642dZhTGBhGAWv7_RECYAOxMhA)

Update defconfig for linux 2.4.29
author iap10@labyrinth.cl.cam.ac.uk
date Fri Jan 21 02:08:45 2005 +0000 (2005-01-21)
parents 328aa630a53e
children d126cac32f08 d331c6994d28 19094c02439e
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 01:05:58 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0	Fri Jan 21 02:08:45 2005 +0000
     1.3 @@ -130,7 +130,6 @@ 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 @@ -162,11 +161,6 @@ 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 @@ -202,7 +196,6 @@ CONFIG_IP_NF_NAT=m
    1.24  CONFIG_IP_NF_NAT_NEEDED=y
    1.25  CONFIG_IP_NF_TARGET_MASQUERADE=m
    1.26  CONFIG_IP_NF_TARGET_REDIRECT=m
    1.27 -# CONFIG_IP_NF_NAT_LOCAL is not set
    1.28  # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
    1.29  CONFIG_IP_NF_NAT_IRC=m
    1.30  CONFIG_IP_NF_NAT_FTP=m
    1.31 @@ -232,11 +225,6 @@ CONFIG_VLAN_8021Q=y
    1.32  #
    1.33  # CONFIG_IPX is not set
    1.34  # CONFIG_ATALK is not set
    1.35 -
    1.36 -#
    1.37 -# Appletalk devices
    1.38 -#
    1.39 -# CONFIG_DEV_APPLETALK is not set
    1.40  # CONFIG_DECNET is not set
    1.41  CONFIG_BRIDGE=y
    1.42  CONFIG_BRIDGE_NF_EBTABLES=m
    1.43 @@ -427,6 +415,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0
    1.44  CONFIG_SCSI_MEGARAID=y
    1.45  # CONFIG_SCSI_MEGARAID2 is not set
    1.46  CONFIG_SCSI_SATA=y
    1.47 +# CONFIG_SCSI_SATA_AHCI is not set
    1.48  # CONFIG_SCSI_SATA_SVW is not set
    1.49  CONFIG_SCSI_ATA_PIIX=y
    1.50  # CONFIG_SCSI_SATA_NV is not set