From 7d76e3f171216757a2ea630d76442084f88a0b4c Mon Sep 17 00:00:00 2001
From: Mike Rapoport <mike@compulab.co.il>
Date: Tue, 7 Oct 2008 11:58:25 +0100
Subject: [PATCH] [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>
---
arch/arm/configs/{xm_x270_defconfig => xm_x2xx_defconfig} | 0
arch/arm/mach-pxa/Makefile | 4 ++--
arch/arm/mach-pxa/{cm-x270-pci.c => cm-x2xx-pci.c} | 0
arch/arm/mach-pxa/{cm-x270-pci.h => cm-x2xx-pci.h} | 0
arch/arm/mach-pxa/{cm-x270.c => cm-x2xx.c} | 2 +-
5 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/configs/{xm_x270_defconfig => xm_x2xx_defconfig} (100%)
rename arch/arm/mach-pxa/{cm-x270-pci.c => cm-x2xx-pci.c} (100%)
rename arch/arm/mach-pxa/{cm-x270-pci.h => cm-x2xx-pci.h} (100%)
rename arch/arm/mach-pxa/{cm-x270.c => cm-x2xx.c} (99%)
diff --git a/arch/arm/configs/xm_x270_defconfig b/arch/arm/configs/xm_x2xx_defconfig
similarity index 100%
rename from arch/arm/configs/xm_x270_defconfig
rename to 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
obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o
obj-$(CONFIG_MACH_SAAR) += saar.o
-obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o
+obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o
obj-$(CONFIG_MACH_CM_X300) += cm-x300.o
obj-$(CONFIG_PXA_EZX) += ezx.o
@@ -67,7 +67,7 @@ led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o
obj-$(CONFIG_LEDS) += $(led-y)
ifeq ($(CONFIG_PCI),y)
-obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
+obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o
endif
obj-$(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
similarity index 100%
rename from arch/arm/mach-pxa/cm-x270-pci.c
rename to 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
similarity index 100%
rename from arch/arm/mach-pxa/cm-x270-pci.h
rename to 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
similarity index 99%
rename from arch/arm/mach-pxa/cm-x270.c
rename to 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 @@
#include <asm/hardware/it8152.h>
#include "generic.h"
-#include "cm-x270-pci.h"
+#include "cm-x2xx-pci.h"
/* virtual addresses for statically mapped regions */
#define CMX270_VIRT_BASE (0xe8000000)