[Xen-changelog] Revert some annoying 2.4 config changes.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1345, 2004/09/27 02:01:43+01:00, ia...@la...

	Revert some annoying 2.4 config changes.



 config.in      |    4 ----
 defconfig-xen0 |    2 +-
 defconfig-xenU |    4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)


diff -Nru a/linux-2.4.27-xen-sparse/arch/xen/config.in b/linux-2.4.27-xen-sparse/arch/xen/config.in
--- a/linux-2.4.27-xen-sparse/arch/xen/config.in	2004-09-27 10:06:12 -04:00
+++ b/linux-2.4.27-xen-sparse/arch/xen/config.in	2004-09-27 10:06:12 -04:00
@@ -25,14 +25,10 @@
 
 if [ "$CONFIG_XEN_PHYSDEV_ACCESS" == "y" ]; then
    define_bool CONFIG_FOREIGN_PAGES y
-   define_bool CONFIG_XEN_BLKDEV_FRONTEND n
-   define_bool CONFIG_XEN_NETDEV_FRONTEND n
 else
    define_bool CONFIG_FOREIGN_PAGES n
    define_bool CONFIG_NETDEVICES y
    define_bool CONFIG_VT n
-   define_bool CONFIG_XEN_BLKDEV_FRONTEND y
-   define_bool CONFIG_XEN_NETDEV_FRONTEND y
 fi
 
 mainmenu_option next_comment
diff -Nru a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0
--- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	2004-09-27 10:06:12 -04:00
+++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	2004-09-27 10:06:12 -04:00
@@ -219,7 +219,7 @@
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 
diff -Nru a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
--- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	2004-09-27 10:06:12 -04:00
+++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	2004-09-27 10:06:12 -04:00
@@ -17,8 +17,6 @@
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_FOREIGN_PAGES is not set
 CONFIG_NETDEVICES=y
@@ -157,7 +155,7 @@
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set