ia64/xen-unstable

changeset 2795:a6f8c872cf01

bitkeeper revision 1.1159.144.2 (41855f1a4Ckq6iiw4dQN4e_VYJJy9Q)

update defconfig file to 2.6.9
author iap10@labyrinth.cl.cam.ac.uk
date Sun Oct 31 21:54:34 2004 +0000 (2004-10-31)
parents 199614e47bee
children 30421f550824
files linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Oct 31 21:51:38 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Oct 31 21:54:34 2004 +0000
     1.3 @@ -1,5 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 +# Linux kernel version: 2.6.9-xen0
     1.7 +# Sun Oct 31 21:30:07 2004
     1.8  #
     1.9  CONFIG_XEN=y
    1.10  CONFIG_ARCH_XEN=y
    1.11 @@ -33,6 +35,7 @@ CONFIG_BROKEN_ON_SMP=y
    1.12  #
    1.13  # General setup
    1.14  #
    1.15 +CONFIG_LOCALVERSION=""
    1.16  CONFIG_SWAP=y
    1.17  CONFIG_SYSVIPC=y
    1.18  # CONFIG_POSIX_MQUEUE is not set
    1.19 @@ -53,6 +56,8 @@ CONFIG_IOSCHED_AS=y
    1.20  CONFIG_IOSCHED_DEADLINE=y
    1.21  CONFIG_IOSCHED_CFQ=y
    1.22  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    1.23 +CONFIG_SHMEM=y
    1.24 +# CONFIG_TINY_SHMEM is not set
    1.25  
    1.26  #
    1.27  # Loadable module support
    1.28 @@ -113,10 +118,6 @@ CONFIG_HAVE_DEC_LOCK=y
    1.29  # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
    1.30  #
    1.31  CONFIG_PCI=y
    1.32 -# CONFIG_PCI_GOBIOS is not set
    1.33 -# CONFIG_PCI_GOMMCONFIG is not set
    1.34 -CONFIG_PCI_GODIRECT=y
    1.35 -# CONFIG_PCI_GOANY is not set
    1.36  CONFIG_PCI_DIRECT=y
    1.37  CONFIG_PCI_LEGACY_PROC=y
    1.38  # CONFIG_PCI_NAMES is not set
    1.39 @@ -203,6 +204,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
    1.40  # CONFIG_BLK_DEV_XD is not set
    1.41  # CONFIG_BLK_CPQ_DA is not set
    1.42  CONFIG_BLK_CPQ_CISS_DA=y
    1.43 +# CONFIG_CISS_SCSI_TAPE is not set
    1.44  # CONFIG_BLK_DEV_DAC960 is not set
    1.45  # CONFIG_BLK_DEV_UMEM is not set
    1.46  CONFIG_BLK_DEV_LOOP=y
    1.47 @@ -250,7 +252,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
    1.48  # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
    1.49  CONFIG_IDEDMA_PCI_AUTO=y
    1.50  # CONFIG_IDEDMA_ONLYDISK is not set
    1.51 -CONFIG_BLK_DEV_ADMA=y
    1.52  # CONFIG_BLK_DEV_AEC62XX is not set
    1.53  # CONFIG_BLK_DEV_ALI15X3 is not set
    1.54  # CONFIG_BLK_DEV_AMD74XX is not set
    1.55 @@ -321,7 +322,6 @@ CONFIG_SCSI_AACRAID=y
    1.56  CONFIG_SCSI_AIC7XXX=y
    1.57  CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
    1.58  CONFIG_AIC7XXX_RESET_DELAY_MS=15000
    1.59 -# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
    1.60  CONFIG_AIC7XXX_DEBUG_ENABLE=y
    1.61  CONFIG_AIC7XXX_DEBUG_MASK=0
    1.62  CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
    1.63 @@ -329,7 +329,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
    1.64  CONFIG_SCSI_AIC79XX=y
    1.65  CONFIG_AIC79XX_CMDS_PER_DEVICE=32
    1.66  CONFIG_AIC79XX_RESET_DELAY_MS=15000
    1.67 -# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
    1.68  # CONFIG_AIC79XX_ENABLE_RD_STRM is not set
    1.69  CONFIG_AIC79XX_DEBUG_ENABLE=y
    1.70  CONFIG_AIC79XX_DEBUG_MASK=0
    1.71 @@ -337,7 +336,8 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
    1.72  # CONFIG_SCSI_DPT_I2O is not set
    1.73  # CONFIG_SCSI_ADVANSYS is not set
    1.74  # CONFIG_SCSI_IN2000 is not set
    1.75 -CONFIG_SCSI_MEGARAID=y
    1.76 +# CONFIG_MEGARAID_NEWGEN is not set
    1.77 +# CONFIG_MEGARAID_LEGACY is not set
    1.78  CONFIG_SCSI_SATA=y
    1.79  # CONFIG_SCSI_SATA_SVW is not set
    1.80  CONFIG_SCSI_ATA_PIIX=y
    1.81 @@ -412,6 +412,7 @@ CONFIG_BLK_DEV_MD=y
    1.82  # CONFIG_MD_LINEAR is not set
    1.83  CONFIG_MD_RAID0=y
    1.84  CONFIG_MD_RAID1=y
    1.85 +# CONFIG_MD_RAID10 is not set
    1.86  CONFIG_MD_RAID5=y
    1.87  # CONFIG_MD_RAID6 is not set
    1.88  # CONFIG_MD_MULTIPATH is not set
    1.89 @@ -463,6 +464,7 @@ CONFIG_IP_PNP_DHCP=y
    1.90  # CONFIG_INET_AH is not set
    1.91  # CONFIG_INET_ESP is not set
    1.92  # CONFIG_INET_IPCOMP is not set
    1.93 +# CONFIG_INET_TUNNEL is not set
    1.94  
    1.95  #
    1.96  # IP: Virtual Server Configuration
    1.97 @@ -477,6 +479,8 @@ CONFIG_BRIDGE_NETFILTER=y
    1.98  # IP: Netfilter Configuration
    1.99  #
   1.100  CONFIG_IP_NF_CONNTRACK=m
   1.101 +CONFIG_IP_NF_CT_ACCT=y
   1.102 +# CONFIG_IP_NF_CT_PROTO_SCTP is not set
   1.103  CONFIG_IP_NF_FTP=m
   1.104  # CONFIG_IP_NF_IRC is not set
   1.105  # CONFIG_IP_NF_TFTP is not set
   1.106 @@ -502,18 +506,20 @@ CONFIG_IP_NF_IPTABLES=m
   1.107  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
   1.108  # CONFIG_IP_NF_MATCH_OWNER is not set
   1.109  # CONFIG_IP_NF_MATCH_PHYSDEV is not set
   1.110 +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
   1.111 +# CONFIG_IP_NF_MATCH_REALM is not set
   1.112 +# CONFIG_IP_NF_MATCH_SCTP is not set
   1.113 +# CONFIG_IP_NF_MATCH_COMMENT is not set
   1.114  # CONFIG_IP_NF_FILTER is not set
   1.115 -# CONFIG_IP_NF_NAT is not set
   1.116 -# CONFIG_IP_NF_MANGLE is not set
   1.117  # CONFIG_IP_NF_TARGET_LOG is not set
   1.118  # CONFIG_IP_NF_TARGET_ULOG is not set
   1.119  # CONFIG_IP_NF_TARGET_TCPMSS is not set
   1.120 +# CONFIG_IP_NF_NAT is not set
   1.121 +# CONFIG_IP_NF_MANGLE is not set
   1.122 +# CONFIG_IP_NF_RAW is not set
   1.123  # CONFIG_IP_NF_ARPTABLES is not set
   1.124  # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
   1.125  # CONFIG_IP_NF_COMPAT_IPFWADM is not set
   1.126 -# CONFIG_IP_NF_RAW is not set
   1.127 -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
   1.128 -# CONFIG_IP_NF_MATCH_REALM is not set
   1.129  
   1.130  #
   1.131  # Bridge: Netfilter Configuration
   1.132 @@ -718,6 +724,7 @@ CONFIG_SERIO_I8042=y
   1.133  CONFIG_SERIO_SERPORT=y
   1.134  # CONFIG_SERIO_CT82C710 is not set
   1.135  # CONFIG_SERIO_PCIPS2 is not set
   1.136 +# CONFIG_SERIO_RAW is not set
   1.137  
   1.138  #
   1.139  # Input Device Drivers
   1.140 @@ -758,7 +765,6 @@ CONFIG_HW_CONSOLE=y
   1.141  CONFIG_UNIX98_PTYS=y
   1.142  CONFIG_LEGACY_PTYS=y
   1.143  CONFIG_LEGACY_PTY_COUNT=256
   1.144 -# CONFIG_QIC02_TAPE is not set
   1.145  
   1.146  #
   1.147  # IPMI
   1.148 @@ -936,6 +942,7 @@ CONFIG_LOCKD_V4=y
   1.149  CONFIG_EXPORTFS=m
   1.150  CONFIG_SUNRPC=y
   1.151  # CONFIG_RPCSEC_GSS_KRB5 is not set
   1.152 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
   1.153  # CONFIG_SMB_FS is not set
   1.154  # CONFIG_CIFS is not set
   1.155  # CONFIG_NCP_FS is not set
   1.156 @@ -1008,6 +1015,7 @@ CONFIG_CRYPTO_MD5=m
   1.157  CONFIG_CRYPTO_SHA1=m
   1.158  # CONFIG_CRYPTO_SHA256 is not set
   1.159  # CONFIG_CRYPTO_SHA512 is not set
   1.160 +# CONFIG_CRYPTO_WP512 is not set
   1.161  CONFIG_CRYPTO_DES=m
   1.162  # CONFIG_CRYPTO_BLOWFISH is not set
   1.163  # CONFIG_CRYPTO_TWOFISH is not set
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Oct 31 21:51:38 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Oct 31 21:54:34 2004 +0000
     2.3 @@ -1,5 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 +# Linux kernel version: 2.6.9-xen0
     2.7 +# Sun Oct 31 21:32:23 2004
     2.8  #
     2.9  CONFIG_XEN=y
    2.10  CONFIG_ARCH_XEN=y
    2.11 @@ -32,6 +34,7 @@ CONFIG_BROKEN_ON_SMP=y
    2.12  #
    2.13  # General setup
    2.14  #
    2.15 +CONFIG_LOCALVERSION=""
    2.16  CONFIG_SWAP=y
    2.17  CONFIG_SYSVIPC=y
    2.18  # CONFIG_POSIX_MQUEUE is not set
    2.19 @@ -51,6 +54,8 @@ CONFIG_IOSCHED_AS=y
    2.20  CONFIG_IOSCHED_DEADLINE=y
    2.21  CONFIG_IOSCHED_CFQ=y
    2.22  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    2.23 +CONFIG_SHMEM=y
    2.24 +# CONFIG_TINY_SHMEM is not set
    2.25  
    2.26  #
    2.27  # Loadable module support
    2.28 @@ -180,9 +185,7 @@ CONFIG_BLK_DEV_SD=m
    2.29  #
    2.30  # SCSI low-level drivers
    2.31  #
    2.32 -# CONFIG_SCSI_AIC7XXX_OLD is not set
    2.33  # CONFIG_SCSI_SATA is not set
    2.34 -# CONFIG_SCSI_EATA_PIO is not set
    2.35  # CONFIG_SCSI_DEBUG is not set
    2.36  
    2.37  #
    2.38 @@ -217,6 +220,7 @@ CONFIG_IP_PNP=y
    2.39  # CONFIG_INET_AH is not set
    2.40  # CONFIG_INET_ESP is not set
    2.41  # CONFIG_INET_IPCOMP is not set
    2.42 +# CONFIG_INET_TUNNEL is not set
    2.43  # CONFIG_IPV6 is not set
    2.44  # CONFIG_NETFILTER is not set
    2.45  
    2.46 @@ -379,6 +383,7 @@ CONFIG_LOCKD_V4=y
    2.47  # CONFIG_EXPORTFS is not set
    2.48  CONFIG_SUNRPC=y
    2.49  # CONFIG_RPCSEC_GSS_KRB5 is not set
    2.50 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
    2.51  # CONFIG_SMB_FS is not set
    2.52  # CONFIG_CIFS is not set
    2.53  # CONFIG_NCP_FS is not set
    2.54 @@ -451,6 +456,7 @@ CONFIG_CRYPTO_MD5=m
    2.55  # CONFIG_CRYPTO_SHA1 is not set
    2.56  # CONFIG_CRYPTO_SHA256 is not set
    2.57  # CONFIG_CRYPTO_SHA512 is not set
    2.58 +# CONFIG_CRYPTO_WP512 is not set
    2.59  # CONFIG_CRYPTO_DES is not set
    2.60  # CONFIG_CRYPTO_BLOWFISH is not set
    2.61  # CONFIG_CRYPTO_TWOFISH is not set