Merge branch 'devel' into next

[pandora-kernel.git] / arch / arm / plat-s3c24xx / Makefile

diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
index 131d202..d82767b 100644 (file)
--- a/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@ -16,8 +16,10 @@ obj-y                                += cpu.o
 obj-y                          += irq.o
 obj-y                          += devs.o
 obj-y                          += gpio.o
+obj-y                          += gpiolib.o
 obj-y                          += time.o
 obj-y                          += clock.o
+obj-y                          += pwm-clock.o
 
 # Architecture dependant builds
 
@@ -27,5 +29,6 @@ obj-$(CONFIG_CPU_S3C244X)     += s3c244x-clock.o
 obj-$(CONFIG_PM_SIMTEC)                += pm-simtec.o
 obj-$(CONFIG_PM)               += pm.o
 obj-$(CONFIG_PM)               += sleep.o
+obj-$(CONFIG_HAVE_PWM)         += pwm.o
 obj-$(CONFIG_S3C2410_DMA)      += dma.o
 obj-$(CONFIG_MACH_SMDK)                += common-smdk.o