summaryrefslogtreecommitdiff
path: root/conf/machine/c7x0.conf
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2006-12-21 11:18:00 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2006-12-21 11:18:00 +0000
commiteabaa88ffbd6d0125d31c629534614f3ede92b43 (patch)
treeebb3845832061ec8e9bc757133e780e058516c9c /conf/machine/c7x0.conf
parent373c52d20c06479a59091293dbeb1cc22ed74dc4 (diff)
parent5a1269e53c80708c3e3f53569791c66eab0cae12 (diff)
merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'
and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'
Diffstat (limited to 'conf/machine/c7x0.conf')
-rw-r--r--conf/machine/c7x0.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 047e44707c..d1afb882e3 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
IMAGE_FSTYPES ?= "jffs2"