summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-31 21:41:32 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-31 21:41:32 +0000
commitdd47bb73357b05e7f165bddd945265ce188a647c (patch)
treee56a5264127ea919dc04fd45a9d740f7832f86b7 /conf/machine
parentebd7c12f4e761ffb102d23a4b8cc8b176a8a63d6 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/31 23:22:49+02:00 vanille.de!mickeyl add preferred opie datebook plugin versions 2005/03/31 23:19:30+02:00 vanille.de!mickeyl collie: build all kernels in one run BKrev: 424c6e8cYTLkRq_9E743zJclpaqIqw
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/collie.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 737ea4be75..90d7ba4cd6 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,7 +5,7 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ${MACHINE}"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "openzaurus-sa"
+PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \