Moved the unsharing of netns into util-vserver-pl

[linux-2.6.git] / kernel-2.6.22-x86_64-planetlab.config

diff --git a/kernel-2.6.22-x86_64-planetlab.config b/kernel-2.6.22-x86_64-planetlab.config
index 8aef954..72d6402 100644 (file)
--- a/kernel-2.6.22-x86_64-planetlab.config
+++ b/kernel-2.6.22-x86_64-planetlab.config
@@ -882,7 +882,7 @@ CONFIG_MD_RAID456=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 CONFIG_DM_DEBUG=y
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
@@ -1857,6 +1857,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+CONFIG_CHOPSTIX=n
 CONFIG_KPROBES=y
 
 #