Merge branch 'eseries' 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 f2b77ef43f2c61edeb12192bf2a70d3a8648694d..5220a5c3fe90f220a1e182b4b7413bc42377a4c3 100644 (file)
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -4,7 +4,7 @@
 
 # Common support (must be linked before board specific support)
 obj-y                          += clock.o devices.o generic.o irq.o dma.o \
-                                  time.o gpio.o
+                                  time.o gpio.o reset.o
 obj-$(CONFIG_PM)               += pm.o sleep.o standby.o
 obj-$(CONFIG_CPU_FREQ)         += cpu-pxa.o
 
@@ -41,6 +41,7 @@ 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
@@ -50,6 +51,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
@@ -63,3 +65,5 @@ obj-$(CONFIG_LEDS)            += $(led-y)
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
 endif
+
+obj-$(CONFIG_TOSA_BT)          += tosa-bt.o