summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-12-14 15:18:38 +0000
committerRod Whitby <rod@whitby.id.au>2006-12-14 15:18:38 +0000
commitfd3e542ac0fad94ae4907e7b370ca68273fd146e (patch)
treed3afe2a265aec3046267ea51064677d36a2a7715
parent9277f8bd534de8dcd25cf5de425774bd02abea46 (diff)
parentb9d891817f88568799b8aab4bf66de2b541c45c9 (diff)
merge of 0c6d0887b83f5cfd506da4e77d3431832c49a46b
and 40da8c329d334d7ca4306f4b2789fe63e92ae52b
-rw-r--r--conf/machine/akita.conf2
-rw-r--r--conf/machine/c7x0.conf2
-rw-r--r--conf/machine/spitz.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 5685c3d0f3..2682fb300f 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
PACKAGE_EXTRA_ARCHS += "iwmmxt"
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"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9a54643b3f..455ae56677 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C3000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"