diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 01:35:29 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 01:35:29 +0100 |
| commit | 0084f27a21d36ac846cd4366289c229a7cce511b (patch) | |
| tree | b151540007af3aa260418c1519a5c69b56450025 /arch/arm/plat-s3c64xx/Makefile | |
| parent | ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver (diff) | |
| parent | ARM: S3C64XX: Add I2S resources in platform code (diff) | |
| download | linux-0084f27a21d36ac846cd4366289c229a7cce511b.tar.xz linux-0084f27a21d36ac846cd4366289c229a7cce511b.zip | |
ARM: Merge next-s3c64xx
Merge branch 'next-s3c64xx' into next-samsung
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
( ADC and RTC PA merge fixed)
Diffstat (limited to 'arch/arm/plat-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c64xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index 80600176cf2a..b241f3695560 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile @@ -13,6 +13,7 @@ obj- := # Core files obj-y += dev-uart.o +obj-y += dev-rtc.o obj-y += cpu.o obj-y += irq.o obj-y += irq-eint.o |