aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2008-10-07 06:58:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 07:05:04 -0400
commit7d76e3f171216757a2ea630d76442084f88a0b4c (patch)
tree6fe814cd0b88ace9cd549ddf9b81de2aad6f5836 /arch
parentd48134e709d51d0ce74d0285e2684ecf38438c7a (diff)
[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support
Signed-off-by: Russ Dill <russ.dill@gmail.com> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/xm_x2xx_defconfig (renamed from arch/arm/configs/xm_x270_defconfig)0
-rw-r--r--arch/arm/mach-pxa/Makefile4
-rw-r--r--arch/arm/mach-pxa/cm-x2xx-pci.c (renamed from arch/arm/mach-pxa/cm-x270-pci.c)0
-rw-r--r--arch/arm/mach-pxa/cm-x2xx-pci.h (renamed from arch/arm/mach-pxa/cm-x270-pci.h)0
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c (renamed from arch/arm/mach-pxa/cm-x270.c)2
5 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/xm_x270_defconfig b/arch/arm/configs/xm_x2xx_defconfig
index aa40d91ce599..aa40d91ce599 100644
--- a/arch/arm/configs/xm_x270_defconfig
+++ b/arch/arm/configs/xm_x2xx_defconfig
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index da89a3ceb1ba..a148c39391f1 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -53,7 +53,7 @@ obj-$(CONFIG_MACH_LITTLETON) += littleton.o
53obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o 53obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o
54obj-$(CONFIG_MACH_SAAR) += saar.o 54obj-$(CONFIG_MACH_SAAR) += saar.o
55 55
56obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o 56obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o
57obj-$(CONFIG_MACH_CM_X300) += cm-x300.o 57obj-$(CONFIG_MACH_CM_X300) += cm-x300.o
58obj-$(CONFIG_PXA_EZX) += ezx.o 58obj-$(CONFIG_PXA_EZX) += ezx.o
59 59
@@ -67,7 +67,7 @@ led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o
67obj-$(CONFIG_LEDS) += $(led-y) 67obj-$(CONFIG_LEDS) += $(led-y)
68 68
69ifeq ($(CONFIG_PCI),y) 69ifeq ($(CONFIG_PCI),y)
70obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o 70obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o
71endif 71endif
72 72
73obj-$(CONFIG_TOSA_BT) += tosa-bt.o 73obj-$(CONFIG_TOSA_BT) += tosa-bt.o
diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
index 2d5bcea1e520..2d5bcea1e520 100644
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
diff --git a/arch/arm/mach-pxa/cm-x270-pci.h b/arch/arm/mach-pxa/cm-x2xx-pci.h
index 48f532f4cb51..48f532f4cb51 100644
--- a/arch/arm/mach-pxa/cm-x270-pci.h
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.h
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x2xx.c
index af003a269534..598837798425 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -35,7 +35,7 @@
35#include <asm/hardware/it8152.h> 35#include <asm/hardware/it8152.h>
36 36
37#include "generic.h" 37#include "generic.h"
38#include "cm-x270-pci.h" 38#include "cm-x2xx-pci.h"
39 39
40/* virtual addresses for statically mapped regions */ 40/* virtual addresses for statically mapped regions */
41#define CMX270_VIRT_BASE (0xe8000000) 41#define CMX270_VIRT_BASE (0xe8000000)