summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c24xx/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-12-18 19:17:37 +0300
committerBen Dooks <ben-linux@fluff.org>2008-12-18 19:17:37 +0300
commit56c035c9ce1f1850969778af6a4cc0b99089b6c8 (patch)
treeb6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2 /arch/arm/plat-s3c24xx/Makefile
parent7f2754378f3522a42daafdbb9d2385f341008454 (diff)
parent438a5d42e052ec6126c5f1e24763b711210db33e (diff)
downloadlinux-56c035c9ce1f1850969778af6a4cc0b99089b6c8.tar.xz
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts: arch/arm/mach-s3c2440/mach-at2440evb.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/Makefile')
-rw-r--r--arch/arm/plat-s3c24xx/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
index a8cfdefc29e9..1e0767b266b8 100644
--- a/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@ -33,6 +33,9 @@ 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
obj-$(CONFIG_S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13) += spi-bus0-gpe11_12_13.o