Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[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 7ab8a2eddd1142c7a3c993fd83204ccc0fb384d2..d64c68b232e3ff8265b9c52df59863b2423004b0 100644 (file)
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_PM)              += pm.o sleep.o standby.o
 ifeq ($(CONFIG_CPU_FREQ),y)
 obj-$(CONFIG_PXA25x)           += cpufreq-pxa2xx.o
 obj-$(CONFIG_PXA27x)           += cpufreq-pxa2xx.o
+obj-$(CONFIG_PXA3xx)           += cpufreq-pxa3xx.o
 endif
 
 # Generic drivers that other drivers may depend upon
@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_TRIZEPS4)   += trizeps4.o
 obj-$(CONFIG_MACH_COLIBRI)     += colibri.o
 obj-$(CONFIG_PXA_SHARP_C7xx)   += corgi.o sharpsl_pm.o corgi_pm.o
 obj-$(CONFIG_PXA_SHARP_Cxx00)  += spitz.o sharpsl_pm.o spitz_pm.o
+obj-$(CONFIG_CORGI_SSP_DEPRECATED)     += corgi_ssp.o corgi_lcd.o
 obj-$(CONFIG_MACH_POODLE)      += poodle.o
 obj-$(CONFIG_MACH_PCM027)      += pcm027.o
 obj-$(CONFIG_MACH_PCM990_BASEBOARD)    += pcm990-baseboard.o