diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 21:43:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 21:43:36 +0100 |
| commit | 5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64 (patch) | |
| tree | 7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6 /arch/arm/mach-pxa/Makefile | |
| parent | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (diff) | |
| parent | ac2536109849217a71510b6ded813e91629e88f6 (diff) | |
Merge branch 'eseries' into pxa
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index b282412a01f5..5220a5c3fe90 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -36,8 +36,12 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o 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 |