ia64/xen-unstable

changeset 1257:128166f77232

bitkeeper revision 1.825.3.16 (406859b6B1jxjQIV_kIuLONUdkXVHA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Mon Mar 29 17:15:34 2004 +0000 (2004-03-29)
parents 0d13d6c5ab80 f293c0d41be2
children bab99b03bc2b
files xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev
line diff
     1.1 --- a/xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev	Mon Mar 29 15:33:44 2004 +0000
     1.2 +++ b/xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev	Mon Mar 29 17:15:34 2004 +0000
     1.3 @@ -119,10 +119,11 @@ CONFIG_BLK_DEV_FD=y
     1.4  # CONFIG_BLK_DEV_DAC960 is not set
     1.5  # CONFIG_BLK_DEV_UMEM is not set
     1.6  CONFIG_BLK_DEV_LOOP=y
     1.7 -# CONFIG_BLK_DEV_NBD is not set
     1.8 -# CONFIG_BLK_DEV_RAM is not set
     1.9 -# CONFIG_BLK_DEV_INITRD is not set
    1.10 -CONFIG_BLK_STATS=y
    1.11 +CONFIG_BLK_DEV_NBD=y
    1.12 +CONFIG_BLK_DEV_RAM=y
    1.13 +CONFIG_BLK_DEV_RAM_SIZE=4096
    1.14 +CONFIG_BLK_DEV_INITRD=y
    1.15 +# CONFIG_BLK_STATS is not set
    1.16  
    1.17  #
    1.18  # Multi-device support (RAID and LVM)