Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d76e3f1 authored by Mike Rapoport's avatar Mike Rapoport Committed by Russell King
Browse files

[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support 



Signed-off-by: default avatarRuss Dill <russ.dill@gmail.com>
Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d48134e7

arch/arm/mach-pxa/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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)