From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 10 Oct 2004 22:24:53 +0000 (+0000)
Subject: PL2340 workaround: disable CKRM memory controller
X-Git-Tag: before-enable-kexec-patch~45
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb75a588d55dbc69f270e5de87e1497a46ee782d;p=linux-2.6.git

PL2340 workaround: disable CKRM memory controller
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 3b380b04c..5bed0a847 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