zaurus-2.6.inc: rename into zaurus.inc.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

7 files changed, 6 insertions, 9 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 4afa515c32..ae089a17a8 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 68c9ba4263..f5ec1325a2 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,7 +2,7 @@
 #@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.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 # NAND factory-default
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 66995e9b09..a0d710cbfc 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "14"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus.inc
index ac79cf3c0a..a80d283d51 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus.inc
@@ -91,9 +91,6 @@ CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
-# iwmmxt under testing
-#MACHINE_FEATURES_append_akita = " usbhost iwmmxt "
-#MACHINE_FEATURES_append_spitz = " usbhost iwmmxt "
 MACHINE_FEATURES_append_akita = " usbhost"
 MACHINE_FEATURES_append_spitz = " usbhost"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index db7a7809a7..d1bcb154b2 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,7 +2,7 @@
 #@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.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0b5331eb44..4019bca4fb 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 MACHINE_FEATURES += "iwmmxt"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index fd1e477465..ab12b8bd56 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.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "28"