Merge branch 'devel-stable' into devel

[net-next-2.6.git] / arch / arm / plat-pxa / Makefile

diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 4aacdd12c9ccb276d3c4b1809317ee7f104bf0ea..6187edfbcb777a13a11eb5eea273abb4901b5c7d 100644 (file)
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -2,7 +2,7 @@
 # Makefile for code common across different PXA processor families
 #
 
-obj-y  := dma.o
+obj-y  := dma.o pmu.o
 
 obj-$(CONFIG_GENERIC_GPIO)     += gpio.o
 obj-$(CONFIG_PXA3xx)           += mfp.o