X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.7-i686-uml-planetlab.config;fp=configs%2Fkernel-2.6.8-i686-uml-planetlab.config;h=0069c2cdfbd2649edee17dff674e3137f7e725ff;hb=c2a3b61c904f8dff0c41f93f1b44b4ba231717b5;hp=bd7f1339baa1b149f83bd4646cc8dfbadb8e71d6;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/configs/kernel-2.6.8-i686-uml-planetlab.config b/configs/kernel-2.6.7-i686-uml-planetlab.config
similarity index 97%
rename from configs/kernel-2.6.8-i686-uml-planetlab.config
rename to configs/kernel-2.6.7-i686-uml-planetlab.config
index bd7f1339b..0069c2cdf 100644
--- a/configs/kernel-2.6.8-i686-uml-planetlab.config
+++ b/configs/kernel-2.6.7-i686-uml-planetlab.config
@@ -35,6 +35,7 @@ CONFIG_UML_REAL_TIME_CLOCK=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
 CONFIG_BROKEN_ON_SMP=y
 
 #
@@ -82,7 +83,6 @@ CONFIG_KMOD=y
 #
 # Generic Driver Options
 #
-CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 #
@@ -247,15 +247,13 @@ CONFIG_IP_NF_MATCH_REALM=m
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
 
 #
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 # CONFIG_NET_SCH_CBQ is not set
 CONFIG_NET_SCH_HTB=m
 # CONFIG_NET_SCH_HFSC is not set
@@ -281,7 +279,6 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_TUX is not set
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
@@ -291,6 +288,7 @@ CONFIG_TUN=m
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+# CONFIG_NE2000 is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -391,6 +389,7 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -464,15 +463,13 @@ CONFIG_NLS_DEFAULT="utf8"
 # Linux VServer
 #
 CONFIG_VSERVER_LEGACY=y
-# CONFIG_VSERVER_PROC_SECURE is not set
+# CONFIG_PROC_SECURE is not set
 CONFIG_VSERVER_HARDCPU=y
 # CONFIG_INOXID_NONE is not set
-# CONFIG_INOXID_UID16 is not set
 # CONFIG_INOXID_GID16 is not set
-CONFIG_INOXID_UGID24=y
-# CONFIG_INOXID_INTERN is not set
-# CONFIG_INOXID_RUNTIME is not set
-CONFIG_VSERVER_DEBUG=y
+CONFIG_INOXID_GID24=y
+# CONFIG_INOXID_GID32 is not set
+# CONFIG_INOXID_MAGIC is not set
 
 #
 # Security options