diff options
| author | Mike Rapoport <mike@compulab.co.il> | 2008-10-07 11:58:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 12:05:04 +0100 |
| commit | 7d76e3f171216757a2ea630d76442084f88a0b4c (patch) | |
| tree | 6fe814cd0b88ace9cd549ddf9b81de2aad6f5836 | |
| parent | d48134e709d51d0ce74d0285e2684ecf38438c7a (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>
| -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/Makefile | 4 | ||||
| -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 aa40d91ce59..aa40d91ce59 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 da89a3ceb1b..a148c39391f 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 index 2d5bcea1e52..2d5bcea1e52 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 48f532f4cb5..48f532f4cb5 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 af003a26953..59883779842 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) |