ia64/xen-unstable

changeset 4221:3b13b05d7111

bitkeeper revision 1.1236.1.89 (423c8e60yT60EPF9qFf1_g26hhY3Jw)

manual merge.
author kaf24@firebug.cl.cam.ac.uk
date Sat Mar 19 20:41:04 2005 +0000 (2005-03-19)
parents 97a5b9def4b3
children 6aa34f9144ae
files linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Sat Mar 19 20:37:32 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Sat Mar 19 20:41:04 2005 +0000
     1.3 @@ -900,16 +900,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
     1.4  # CONFIG_INFINIBAND is not set
     1.5  
     1.6  #
     1.7 -# MMC/SD Card support
     1.8 -#
     1.9 -# CONFIG_MMC is not set
    1.10 -
    1.11 -#
    1.12 -# InfiniBand support
    1.13 -#
    1.14 -# CONFIG_INFINIBAND is not set
    1.15 -
    1.16 -#
    1.17  # File systems
    1.18  #
    1.19  CONFIG_EXT2_FS=y