summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorJeremy Laine <jeremy.laine@m4x.org>2007-11-28 12:14:40 +0000
committerJeremy Laine <jeremy.laine@m4x.org>2007-11-28 12:14:40 +0000
commitdff263b991bbfbaa61fb4ca5420af35237516e2d (patch)
tree7d0b35596d2bf2c8a923f4f5ffe398cefafab404 /conf/machine
parent0a7584d87cca139e6e88149eda137d77ed039501 (diff)
parent851746c1c01388990f6908dd51bf1c3756eabec1 (diff)
merge of 'ce64d96dcf3b268df1bdcd7e945e7188d09c7db8'
and 'd521cbe6aca8b81bda5eb51149cea06dd31e1dd2'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/ixp4xx.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 175ec80e6a..81e2152bdc 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -8,7 +8,7 @@ ROOT_FLASH_SIZE ?= "12"
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
require conf/machine/include/tune-xscale.inc
require conf/machine/include/tune-thumb.inc