diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 17:42:02 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 17:42:02 +0900 |
| commit | 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 (patch) | |
| tree | b151540007af3aa260418c1519a5c69b56450025 /arch/arm/plat-samsung/Makefile | |
| parent | 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e (diff) | |
| parent | bcedfa98d97e02e95bb023ab93675dbe63c508ef (diff) | |
ARM: Merge next-samsung-mc-adc
Merge branch 'next-samsung-mc-adc' into next-samsung-try5
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
(fix ADC and RTC merge)
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index aeb7e12d1f6..ee310384b90 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -20,6 +20,10 @@ obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o obj-$(CONFIG_SAMSUNG_IRQ_UART) += irq-uart.o obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o +# ADC + +obj-$(CONFIG_S3C_ADC) += adc.o + # devices obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o |