diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:07:25 +0900 |
| commit | 14b8a0f92b309ff452a8c339abd9a096d00b210f (patch) | |
| tree | 0472637882c576873aae00207a07f9d178cdebd7 /arch/arm/plat-samsung/Makefile | |
| parent | 05a690d2db5bd57d3c94293b06b69158535835df (diff) | |
| parent | adc0950c08e1f433f6933759f4facf9b2cf8d29d (diff) | |
| download | kernel_samsung_tuna-14b8a0f92b309ff452a8c339abd9a096d00b210f.zip kernel_samsung_tuna-14b8a0f92b309ff452a8c339abd9a096d00b210f.tar.gz kernel_samsung_tuna-14b8a0f92b309ff452a8c339abd9a096d00b210f.tar.bz2 | |
ARM: Merge for-2635/samsung-rtc
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
Conflicts:
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 761407f..7068af3 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -41,6 +41,8 @@ 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_S3C_DEV_RTC) += dev-rtc.o + obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o # DMA support |