summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/c7x0.conf4
-rw-r--r--conf/machine/include/poodle-2.6.conf2
-rw-r--r--conf/machine/include/zaurus-2.6.inc (renamed from conf/machine/include/zaurus-2.6.conf)0
-rw-r--r--conf/machine/include/zaurus-clamshell.inc (renamed from conf/machine/include/zaurus-clamshell.conf)0
-rw-r--r--conf/machine/poodle.conf2
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/tosa.conf2
8 files changed, 9 insertions, 9 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index fad73c53bf..de94f560f9 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
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 098d0526f0..6862a8095f 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
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc
index ada838f0d6..ada838f0d6 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.inc
index f66502eff1..f66502eff1 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index a548f513d3..eee1edd53e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,6 +2,6 @@
#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 81c789dcc4..3199065606 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
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ddaf6e03c9..83227ee0c4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -2,7 +2,7 @@
#@NAME: Sharp Zaurus SL-6000
#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
# newer kernels does not build
PREFERRED_VERSION_linux-rp = "2.6.17"