From 66ce72fe9457ea462fe3b4c7f912e6691f451ded Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:38:12 +0000 Subject: [PATCH] zaurus machines: renamed zaurus-clamshell-2.6.conf into zaurus-2.6.conf as it is used in all 2.6 powered models --- conf/machine/akita.conf | 2 +- conf/machine/c7x0.conf | 2 +- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/tosa-2.6.conf | 2 +- .../include/{zaurus-clamshell-2.6.conf => zaurus-2.6.conf} | 2 +- conf/machine/spitz.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename conf/machine/include/{zaurus-clamshell-2.6.conf => zaurus-2.6.conf} (95%) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 0358864c70..e14efa76a0 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IPKG_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 4b1d8edb80..893378f569 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -3,7 +3,7 @@ #@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-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index eff0ad4c7c..01a06b7c27 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-clamshell-2.6.conf +require conf/machine/include/zaurus-2.6.conf diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf index 6831b0ea91..f3591b4b75 100644 --- a/conf/machine/include/tosa-2.6.conf +++ b/conf/machine/include/tosa-2.6.conf @@ -1,4 +1,4 @@ -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf # wlan-ng Modules MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-2.6.conf similarity index 95% rename from conf/machine/include/zaurus-clamshell-2.6.conf rename to conf/machine/include/zaurus-2.6.conf index e0a9e38e91..e426011d77 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" -MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index af50217e0f..5434efbaf6 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" -- 2.39.5