summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:05:42 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:05:42 +0900
commit05a690d2db5bd57d3c94293b06b69158535835df (patch)
treefb924faf327ae3d6b1f4a7cde96e007e9b32d7be /arch/arm/plat-samsung/Makefile
parent1770a8988f6178efdc1bfc85fb29deacac49fe91 (diff)
parent4f7cdc38c000deba82479205f4c99f4c1e7c6d1f (diff)
downloadblackbird-op-linux-05a690d2db5bd57d3c94293b06b69158535835df.tar.gz
blackbird-op-linux-05a690d2db5bd57d3c94293b06b69158535835df.zip
ARM: Merge for-2635/samsung-ts
Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
-rw-r--r--arch/arm/plat-samsung/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index ca6036745edc..761407fe8135 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-y += dev-uart.o
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
+obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o
# DMA support
OpenPOWER on IntegriCloud