ia64/xen-unstable

changeset 1636:5f52968e99a7

bitkeeper revision 1.1039 (40e2a7afKt88L7A1O_1cfq9LUDkUJA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/hp.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Jun 30 11:44:47 2004 +0000 (2004-06-30)
parents 24b6048583ea ce0bcc69ba87
children ebcc736aed4f
files linux-2.4.26-xen-sparse/arch/xen/config.in linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/config.in	Wed Jun 30 11:07:39 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/config.in	Wed Jun 30 11:44:47 2004 +0000
     1.3 @@ -21,6 +21,7 @@ endmenu
     1.4  define_bool CONFIG_NO_IDLE_HZ y
     1.5  
     1.6  if [ "$CONFIG_XEN_PHYSDEV_ACCESS" != "y" ]; then
     1.7 +   define_bool CONFIG_NETDEVICES y
     1.8     define_bool CONFIG_VT n
     1.9  fi
    1.10  
    1.11 @@ -173,17 +174,19 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" 
    1.12        define_bool CONFIG_BLK_DEV_HD n
    1.13     fi
    1.14     endmenu
    1.15 +fi
    1.16  
    1.17 -   mainmenu_option next_comment
    1.18 -   comment 'SCSI support'
    1.19 +mainmenu_option next_comment
    1.20 +comment 'SCSI support'
    1.21  
    1.22 -   tristate 'SCSI support' CONFIG_SCSI
    1.23 +tristate 'SCSI support' CONFIG_SCSI
    1.24  
    1.25 -   if [ "$CONFIG_SCSI" != "n" ]; then
    1.26 -      source drivers/scsi/Config.in
    1.27 -   fi
    1.28 -   endmenu
    1.29 +if [ "$CONFIG_SCSI" != "n" ]; then
    1.30 +   source drivers/scsi/Config.in
    1.31 +fi
    1.32 +endmenu
    1.33  
    1.34 +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    1.35     source drivers/message/fusion/Config.in
    1.36  
    1.37     source drivers/ieee1394/Config.in
    1.38 @@ -234,18 +237,6 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" 
    1.39     #
    1.40     source drivers/input/Config.in
    1.41  else
    1.42 -   define_bool CONFIG_NETDEVICES y
    1.43 -
    1.44 -   mainmenu_option next_comment
    1.45 -   comment 'SCSI support'
    1.46 -
    1.47 -   tristate 'SCSI support' CONFIG_SCSI
    1.48 -
    1.49 -   if [ "$CONFIG_SCSI" != "n" ]; then
    1.50 -      source drivers/scsi/Config.in
    1.51 -   fi
    1.52 -   endmenu
    1.53 -
    1.54     #
    1.55     # Block device driver configuration
    1.56     #
     2.1 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Wed Jun 30 11:07:39 2004 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Wed Jun 30 11:44:47 2004 +0000
     2.3 @@ -13,6 +13,8 @@ CONFIG_UID16=y
     2.4  # CONFIG_XEN_PRIVILEGED_GUEST is not set
     2.5  # CONFIG_XEN_PHYSDEV_ACCESS is not set
     2.6  CONFIG_NO_IDLE_HZ=y
     2.7 +CONFIG_NETDEVICES=y
     2.8 +# CONFIG_VT is not set
     2.9  
    2.10  #
    2.11  # Code maturity level options
    2.12 @@ -179,7 +181,6 @@ CONFIG_IP_NF_TARGET_ULOG=y
    2.13  # Network testing
    2.14  #
    2.15  # CONFIG_NET_PKTGEN is not set
    2.16 -CONFIG_NETDEVICES=y
    2.17  
    2.18  #
    2.19  # SCSI support
    2.20 @@ -519,8 +520,6 @@ CONFIG_NLS_ISO8859_1=y
    2.21  # Console drivers
    2.22  #
    2.23  CONFIG_XEN_CONSOLE=y
    2.24 -# CONFIG_VGA_CONSOLE is not set
    2.25 -CONFIG_DUMMY_CONSOLE=y
    2.26  
    2.27  #
    2.28  # Kernel hacking