summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-08-10 19:45:33 -0700
committerKhem Raj <raj.khem@gmail.com>2009-08-10 19:45:33 -0700
commit08020ed71ffccfd2893ba869e73e3a169a5ae068 (patch)
tree9c329dd0d52bad0d2e0c5fa5726a6dc6dcffeae2 /conf
parent19a190ca2bedf9a8d017f3c5fb163d51d0b3a828 (diff)
parent0d3f61c8280b329f573ded891fad573f666379db (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/em-x270.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index f8a5c951b7..efcf10484a 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
GUI_MACHINE_CLASS ?= "bigscreen"
PACKAGE_EXTRA_ARCHS = "iwmmxt "
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
#require conf/machine/include/tune-xscale.inc
@@ -43,7 +43,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth wifi usbhost usbgadg
#
#PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_VERSION_em-x270 = "2.6.23"
+PREFERRED_VERSION_linux = "2.6.23"
MODUTILS = "26"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"