Merge branch 'linus' into core/printk

[karo-tx-linux.git] / arch / arm / plat-s3c24xx / Makefile

diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
index 8da14beda7702e5291a4f720cdac059addf6e16b..1e0767b266b8e9d6963bb390a02b1bf203b9b801 100644 (file)
--- a/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@ -18,7 +18,6 @@ obj-y                         += devs.o
 obj-y                          += gpio.o
 obj-y                          += gpiolib.o
 obj-y                          += clock.o
-obj-y                          += pwm-clock.o
 obj-$(CONFIG_S3C24XX_DCLK)     += clock-dclk.o
 
 # Architecture dependant builds
@@ -32,6 +31,10 @@ obj-$(CONFIG_PM)             += sleep.o
 obj-$(CONFIG_HAVE_PWM)         += pwm.o
 obj-$(CONFIG_S3C2410_CLOCK)    += s3c2410-clock.o
 obj-$(CONFIG_S3C2410_DMA)      += dma.o
+obj-$(CONFIG_S3C24XX_ADC)      += adc.o
+
+# device specific setup and/or initialisation
+obj-$(CONFIG_ARCH_S3C2410)     += setup-i2c.o
 
 # SPI gpio central GPIO functions