From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 15 Nov 2004 17:58:05 +0000 (+0000)
Subject: - merge revision 1.11
X-Git-Tag: after-CAN_2004_1016_1017_1068-merge~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72d5b3b92956d4a05f24d8f995567e4842b7c3b9;p=linux-2.6.git

- merge revision 1.11
date: 2004/11/09 16:48:52;  author: mef;  state: Exp;  lines: +1 -2
Turned off CKRM memory controller.
Waiting for PL2899 to be resolved, which involves waiting for the
CKRM/IBM folks.
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 57497236c..ea66387e5 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -31,8 +31,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y
 CONFIG_CKRM_RES_NUMTASKS=y
 CONFIG_CKRM_CPU_SCHEDULE=y
 CONFIG_CKRM_RES_BLKIO=y
-CONFIG_CKRM_RES_MEM=y
-# CONFIG_CKRM_MEM_LRUORDER_CHANGE is not set
+# CONFIG_CKRM_RES_MEM is not set
 # CONFIG_CKRM_TYPE_SOCKETCLASS is not set
 CONFIG_CKRM_RBCE=y
 CONFIG_SYSCTL=y