summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-02-13 20:45:16 +0000
committerKoen Kooi <koen@openembedded.org>2007-02-13 20:45:16 +0000
commit824ca8e331f11bf53b33697a5b3a4cc2edfc82f0 (patch)
treecc0d7324a067ecf72754ef9501aeb4362aa9dfb4 /conf
parenta7d5f5476e29516c2e2a1ffe35b37fb067121d5e (diff)
parenta48dc80e6bf3d848311996d32ecd71eff3602643 (diff)
merge of 'c80d3d5fe446b4ab1b902de2706822e04b306ab8'
and 'dd511be6577324f0680f20fabc392b0941182942'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1-oabi.conf2
-rw-r--r--conf/machine/include/simpad-2.6.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index c88aa06697..4dbdcca795 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -11,7 +11,7 @@ TARGET_OS = "linux"
PACKAGE_ARCH = "arm-oabi"
PACKAGE_EXTRA_ARCHS = "arm-oabi"
-PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh7"
+PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh10"
FEED_ARCH_collie = "arm-oabi"
FEED_ARCH_h3600 = "arm-oabi"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index 45ddac1bec..69f04f0730 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,4 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"