Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / Makefile

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index d7dc3a76e33c1ec11e36abc583791f61c7e02def..0865236513c7853659e1cd7918c1c967a233b6d3 100644 (file)
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -47,6 +47,7 @@ endif
 obj-$(CONFIG_MACH_LITTLETON)   += littleton.o
 
 obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o
+obj-$(CONFIG_PXA_EZX)           += ezx.o
 
 # Support for blinky lights
 led-y := leds.o