commit dcd925f95194da42e42cea7e5f901f9746cf441c
author Jonathan Cameron <jic23@cam.ac.uk> Sun Jun 06 14:55:02 2010 +0100
committer Eric Miao <eric.y.miao@gmail.com> Thu Aug 05 14:32:16 2010 +0800
tree 05ccace4c48f04a8a0aa48bfc6123c73412b70c2
parent 5aa9a2cbc037b2ec34b76619d233852d2d17b502

[ARM] pxa: merge stargate2 and imote2 board files

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

arch/arm/mach-pxa/Makefile

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 66e8989..3f72218 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -51,7 +51,7 @@
 obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o
 obj-$(CONFIG_GUMSTIX_AM200EPD)	+= am200epd.o
 obj-$(CONFIG_GUMSTIX_AM300EPD)	+= am300epd.o
-obj-$(CONFIG_MACH_INTELMOTE2)   += imote2.o
+obj-$(CONFIG_MACH_INTELMOTE2)	+= stargate2.o
 obj-$(CONFIG_MACH_STARGATE2)	+= stargate2.o
 obj-$(CONFIG_MACH_XCEP)         += xcep.o
 obj-$(CONFIG_MACH_TRIZEPS4)	+= trizeps4.o