From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Jul 2008 20:43:36 +0000 (+0100)
Subject: Merge branch 'eseries' into pxa
X-Git-Tag: v2.6.27-rc1~850^2^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64;p=linux-2.6-omap-h63xx.git

Merge branch 'eseries' into pxa

Conflicts:

	arch/arm/mach-pxa/Makefile
---

5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64
diff --cc arch/arm/mach-pxa/Makefile
index b282412a01f,f2b77ef43f2..5220a5c3fe9
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@@ -36,8 -36,11 +36,12 @@@ obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= 
  obj-$(CONFIG_MACH_TOSA)		+= tosa.o
  obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o
  obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o
- obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o
- obj-$(CONFIG_MACH_PALMTX)+= palmtx.o
+ obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o eseries_udc.o
+ obj-$(CONFIG_MACH_E740)		+= e740_lcd.o
+ obj-$(CONFIG_MACH_E750)		+= e750_lcd.o
+ obj-$(CONFIG_MACH_E400)		+= e400_lcd.o
+ obj-$(CONFIG_MACH_E800)		+= e800_lcd.o
++obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o
  
  ifeq ($(CONFIG_MACH_ZYLONITE),y)
    obj-y				+= zylonite.o