ia64/xen-unstable
changeset 2087:4cccb33cf202
bitkeeper revision 1.1151 (41120fb8xr8_V1PLbpmrRK70-fx9Rw)
Merge tetris.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tetris.cl.cam.ac.uk:/auto/anfs/scratch/tetris/iap10/xeno-clone/xeno.bk
Merge tetris.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tetris.cl.cam.ac.uk:/auto/anfs/scratch/tetris/iap10/xeno-clone/xeno.bk
author | iap10@tetris.cl.cam.ac.uk |
---|---|
date | Thu Aug 05 10:45:12 2004 +0000 (2004-08-05) |
parents | 054be53e2b9d d04608f28a27 |
children | ba8727dce7d7 |
files | linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig |
line diff
1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig Thu Aug 05 10:01:27 2004 +0000 1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig Thu Aug 05 10:45:12 2004 +0000 1.3 @@ -27,10 +27,10 @@ CONFIG_BROKEN_ON_SMP=y 1.4 # General setup 1.5 # 1.6 CONFIG_SWAP=y 1.7 -# CONFIG_SYSVIPC is not set 1.8 +CONFIG_SYSVIPC=y 1.9 # CONFIG_POSIX_MQUEUE is not set 1.10 # CONFIG_BSD_PROCESS_ACCT is not set 1.11 -# CONFIG_SYSCTL is not set 1.12 +CONFIG_SYSCTL=y 1.13 # CONFIG_AUDIT is not set 1.14 CONFIG_LOG_BUF_SHIFT=14 1.15 # CONFIG_HOTPLUG is not set 1.16 @@ -161,10 +161,13 @@ CONFIG_BINFMT_ELF=y 1.17 # CONFIG_BLK_CPQ_CISS_DA is not set 1.18 # CONFIG_BLK_DEV_DAC960 is not set 1.19 # CONFIG_BLK_DEV_UMEM is not set 1.20 -# CONFIG_BLK_DEV_LOOP is not set 1.21 +CONFIG_BLK_DEV_LOOP=y 1.22 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set 1.23 # CONFIG_BLK_DEV_NBD is not set 1.24 # CONFIG_BLK_DEV_CARMEL is not set 1.25 -# CONFIG_BLK_DEV_RAM is not set 1.26 +CONFIG_BLK_DEV_RAM=y 1.27 +CONFIG_BLK_DEV_RAM_SIZE=4096 1.28 +# CONFIG_BLK_DEV_INITRD is not set 1.29 # CONFIG_LBD is not set 1.30 1.31 # 1.32 @@ -218,7 +221,7 @@ CONFIG_BLK_DEV_PIIX=y 1.33 # CONFIG_BLK_DEV_NS87415 is not set 1.34 # CONFIG_BLK_DEV_PDC202XX_OLD is not set 1.35 # CONFIG_BLK_DEV_PDC202XX_NEW is not set 1.36 -# CONFIG_BLK_DEV_SVWKS is not set 1.37 +CONFIG_BLK_DEV_SVWKS=y 1.38 # CONFIG_BLK_DEV_SIIMAGE is not set 1.39 # CONFIG_BLK_DEV_SIS5513 is not set 1.40 # CONFIG_BLK_DEV_SLC90E66 is not set