Merge branch 'devel-stable' into devel

[deliverable/linux.git] / arch / arm / plat-pxa / Makefile

diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index f68da35f4fb3ad34015eb615c34096ba23c23692..6187edfbcb777a13a11eb5eea273abb4901b5c7d 100644 (file)
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_PXA3xx)            += mfp.o
 obj-$(CONFIG_ARCH_MMP)         += mfp.o
 
 obj-$(CONFIG_HAVE_PWM)         += pwm.o
+obj-$(CONFIG_PXA_SSP)          += ssp.o