Skip to content

Commit

Permalink
[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of c…
Browse files Browse the repository at this point in the history
…m-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>
  • Loading branch information
Mike Rapoport authored and Russell King committed Oct 7, 2008
1 parent d48134e commit 7d76e3f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 3 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7d76e3f

Please sign in to comment.