projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fecc34 ac25361)
Merge branch 'eseries' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:36 +0000 (21:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:36 +0000 (21:43 +0100)
Conflicts:

arch/arm/mach-pxa/Makefile

1  2 
arch/arm/mach-pxa/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-pxa/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/Makefile
index b282412a01f55a2ab729d1b71b05fcedf0fef62b,f2b77ef43f2c61edeb12192bf2a70d3a8648694d..5220a5c3fe90f220a1e182b4b7413bc42377a4c3
--- 1/arch/arm/mach-pxa/Makefile
--- 2/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