diff options
author | Mike Rapoport <mike@compulab.co.il> | 2008-10-07 06:58:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 07:05:04 -0400 |
commit | 7d76e3f171216757a2ea630d76442084f88a0b4c (patch) | |
tree | 6fe814cd0b88ace9cd549ddf9b81de2aad6f5836 /arch/arm/mach-pxa/Makefile | |
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>
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
53 | obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o | 53 | obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o |
54 | obj-$(CONFIG_MACH_SAAR) += saar.o | 54 | obj-$(CONFIG_MACH_SAAR) += saar.o |
55 | 55 | ||
56 | obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o | 56 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o |
57 | obj-$(CONFIG_MACH_CM_X300) += cm-x300.o | 57 | obj-$(CONFIG_MACH_CM_X300) += cm-x300.o |
58 | obj-$(CONFIG_PXA_EZX) += ezx.o | 58 | obj-$(CONFIG_PXA_EZX) += ezx.o |
59 | 59 | ||
@@ -67,7 +67,7 @@ led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o | |||
67 | obj-$(CONFIG_LEDS) += $(led-y) | 67 | obj-$(CONFIG_LEDS) += $(led-y) |
68 | 68 | ||
69 | ifeq ($(CONFIG_PCI),y) | 69 | ifeq ($(CONFIG_PCI),y) |
70 | obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o | 70 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o |
71 | endif | 71 | endif |
72 | 72 | ||
73 | obj-$(CONFIG_TOSA_BT) += tosa-bt.o | 73 | obj-$(CONFIG_TOSA_BT) += tosa-bt.o |