ia64/xen-unstable

changeset 2561:4f44af98878b

bitkeeper revision 1.1159.1.186 (41576677S5QEgpnRR53rt-wqZY63Kw)

Revert some annoying 2.4 config changes.
author iap10@labyrinth.cl.cam.ac.uk
date Mon Sep 27 01:01:43 2004 +0000 (2004-09-27)
parents 13eee2d191f6
children 464c5ab1400e
files linux-2.4.27-xen-sparse/arch/xen/config.in linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
line diff
     1.1 --- a/linux-2.4.27-xen-sparse/arch/xen/config.in	Sat Sep 25 16:59:06 2004 +0000
     1.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/config.in	Mon Sep 27 01:01:43 2004 +0000
     1.3 @@ -25,14 +25,10 @@ define_bool CONFIG_NO_IDLE_HZ y
     1.4  
     1.5  if [ "$CONFIG_XEN_PHYSDEV_ACCESS" == "y" ]; then
     1.6     define_bool CONFIG_FOREIGN_PAGES y
     1.7 -   define_bool CONFIG_XEN_BLKDEV_FRONTEND n
     1.8 -   define_bool CONFIG_XEN_NETDEV_FRONTEND n
     1.9  else
    1.10     define_bool CONFIG_FOREIGN_PAGES n
    1.11     define_bool CONFIG_NETDEVICES y
    1.12     define_bool CONFIG_VT n
    1.13 -   define_bool CONFIG_XEN_BLKDEV_FRONTEND y
    1.14 -   define_bool CONFIG_XEN_NETDEV_FRONTEND y
    1.15  fi
    1.16  
    1.17  mainmenu_option next_comment
     2.1 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	Sat Sep 25 16:59:06 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	Mon Sep 27 01:01:43 2004 +0000
     2.3 @@ -219,7 +219,7 @@ CONFIG_IP_NF_TARGET_ULOG=y
     2.4  #
     2.5  # CONFIG_IP_SCTP is not set
     2.6  # CONFIG_ATM is not set
     2.7 -# CONFIG_VLAN_8021Q is not set
     2.8 +CONFIG_VLAN_8021Q=y
     2.9  # CONFIG_IPX is not set
    2.10  # CONFIG_ATALK is not set
    2.11  
     3.1 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	Sat Sep 25 16:59:06 2004 +0000
     3.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	Mon Sep 27 01:01:43 2004 +0000
     3.3 @@ -17,8 +17,6 @@ CONFIG_UID16=y
     3.4  CONFIG_XEN_BLKDEV_FRONTEND=y
     3.5  CONFIG_XEN_NETDEV_FRONTEND=y
     3.6  CONFIG_XEN_SCRUB_PAGES=y
     3.7 -CONFIG_XEN_NETDEV_FRONTEND=y
     3.8 -CONFIG_XEN_BLKDEV_FRONTEND=y
     3.9  CONFIG_NO_IDLE_HZ=y
    3.10  # CONFIG_FOREIGN_PAGES is not set
    3.11  CONFIG_NETDEVICES=y
    3.12 @@ -157,7 +155,7 @@ CONFIG_IP_NF_TARGET_ULOG=y
    3.13  #
    3.14  # CONFIG_IP_SCTP is not set
    3.15  # CONFIG_ATM is not set
    3.16 -# CONFIG_VLAN_8021Q is not set
    3.17 +CONFIG_VLAN_8021Q=y
    3.18  # CONFIG_IPX is not set
    3.19  # CONFIG_ATALK is not set
    3.20