From aee6452dfcdb1e2a3fb3f3d434635ddca8fad516 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 29 Jun 2007 04:34:08 +0000
Subject: [PATCH] remove VSERVER_ACB_SCHED

---
 configs/kernel-2.6.20-i586-planetlab.config       | 1 -
 configs/kernel-2.6.20-i686-planetlab.config       | 7 +++----
 configs/kernel-2.6.20-i686-smp-planetlab.config   | 1 -
 configs/kernel-2.6.20-i686-uml-planetlab.config   | 1 -
 configs/kernel-2.6.20-i686-xenU-planetlab.config  | 1 -
 configs/kernel-2.6.20-x86_64-planetlab.config     | 1 -
 configs/kernel-2.6.20-x86_64-smp-planetlab.config | 1 -
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configs/kernel-2.6.20-i586-planetlab.config b/configs/kernel-2.6.20-i586-planetlab.config
index 462b12f58..73afe188d 100644
--- a/configs/kernel-2.6.20-i586-planetlab.config
+++ b/configs/kernel-2.6.20-i586-planetlab.config
@@ -1777,7 +1777,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-i686-planetlab.config b/configs/kernel-2.6.20-i686-planetlab.config
index 58a9983eb..4704c0c08 100644
--- a/configs/kernel-2.6.20-i686-planetlab.config
+++ b/configs/kernel-2.6.20-i686-planetlab.config
@@ -1199,9 +1199,9 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_INTEL=y
-CONFIG_HW_RANDOM_AMD=y
-CONFIG_HW_RANDOM_GEODE=y
-CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
@@ -1819,7 +1819,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-i686-smp-planetlab.config b/configs/kernel-2.6.20-i686-smp-planetlab.config
index c49ed3869..3f2f52309 100644
--- a/configs/kernel-2.6.20-i686-smp-planetlab.config
+++ b/configs/kernel-2.6.20-i686-smp-planetlab.config
@@ -1790,7 +1790,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-i686-uml-planetlab.config b/configs/kernel-2.6.20-i686-uml-planetlab.config
index 6466082db..64237fb31 100644
--- a/configs/kernel-2.6.20-i686-uml-planetlab.config
+++ b/configs/kernel-2.6.20-i686-uml-planetlab.config
@@ -638,7 +638,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-i686-xenU-planetlab.config b/configs/kernel-2.6.20-i686-xenU-planetlab.config
index dd148bedb..5976be745 100644
--- a/configs/kernel-2.6.20-i686-xenU-planetlab.config
+++ b/configs/kernel-2.6.20-i686-xenU-planetlab.config
@@ -1117,7 +1117,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-x86_64-planetlab.config b/configs/kernel-2.6.20-x86_64-planetlab.config
index cbcc608b9..dae34be92 100644
--- a/configs/kernel-2.6.20-x86_64-planetlab.config
+++ b/configs/kernel-2.6.20-x86_64-planetlab.config
@@ -1709,7 +1709,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
diff --git a/configs/kernel-2.6.20-x86_64-smp-planetlab.config b/configs/kernel-2.6.20-x86_64-smp-planetlab.config
index d103253b6..8134779be 100644
--- a/configs/kernel-2.6.20-x86_64-smp-planetlab.config
+++ b/configs/kernel-2.6.20-x86_64-smp-planetlab.config
@@ -1720,7 +1720,6 @@ CONFIG_VSERVER_COWBL=y
 CONFIG_VSERVER_HARDCPU=y
 CONFIG_VSERVER_IDLETIME=y
 # CONFIG_VSERVER_IDLELIMIT is not set
-CONFIG_VSERVER_ACB_SCHED=y
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
 # CONFIG_TAGGING_GID16 is not set
-- 
2.47.0