Преглед на файлове

[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>
Mike Rapoport преди 16 години
родител
ревизия
7d76e3f171
променени са 5 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 0 0
      arch/arm/configs/xm_x2xx_defconfig
  2. 2 2
      arch/arm/mach-pxa/Makefile
  3. 0 0
      arch/arm/mach-pxa/cm-x2xx-pci.c
  4. 0 0
      arch/arm/mach-pxa/cm-x2xx-pci.h
  5. 1 1
      arch/arm/mach-pxa/cm-x2xx.c

+ 0 - 0
arch/arm/configs/xm_x270_defconfig → arch/arm/configs/xm_x2xx_defconfig


+ 2 - 2
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

+ 0 - 0
arch/arm/mach-pxa/cm-x270-pci.c → arch/arm/mach-pxa/cm-x2xx-pci.c


+ 0 - 0
arch/arm/mach-pxa/cm-x270-pci.h → arch/arm/mach-pxa/cm-x2xx-pci.h


+ 1 - 1
arch/arm/mach-pxa/cm-x270.c → 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)