summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-02-19 07:24:34 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-02-19 07:24:34 +0000
commitaf611983e0f4a013e1fb5a19715c6e803dbb68d7 (patch)
tree123067a75e489e9dc1fed28bda78641136ee829e /conf
parent464d501ed34c9b151ff535d95efc4f4b29d4b761 (diff)
parent7eb910e2177cfb1e185df53c68eb41f439cf9bc2 (diff)
merge of '6a082250c6cd3fb922881d5729805a86eb61e646'
and 'e28e771e310bd57f5612859b2188e316aec06191'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/collie-2.4.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf
index a77d12a53f..5b99c7485d 100644
--- a/conf/machine/include/collie-2.4.conf
+++ b/conf/machine/include/collie-2.4.conf
@@ -1,4 +1,5 @@
-PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+COLLIE_MEMORY_SIZE =? "64"
# workaround for bug 1877
PREFERRED_PROVIDER_hostap-modules = "hostap-modules"