diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 06:01:37 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 06:01:37 +0000 |
commit | 7dae8c5209147ad06d424928a5f1ec45caa87691 (patch) | |
tree | 9d62ca389dde613cf6eba66710eb06d513f202a5 /arch/arm/mach-s3c2416 | |
parent | ac819a86a76dc29d18306f5c998c38af1ebb58cd (diff) | |
parent | b2994d318dc78c9a4a43605629f00217335ada28 (diff) |
Merge branch 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices
rtc-s3c: add variants for S3C2443 and S3C2416
rtc-s3c: make room for more variants in devicetree block
ARM: SAMSUNG: cleanup of rtc register definitions
Diffstat (limited to 'arch/arm/mach-s3c2416')
-rw-r--r-- | arch/arm/mach-s3c2416/s3c2416.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c index 08bb0355159d..0e9a71c90ed7 100644 --- a/arch/arm/mach-s3c2416/s3c2416.c +++ b/arch/arm/mach-s3c2416/s3c2416.c @@ -59,6 +59,7 @@ #include <plat/fb-core.h> #include <plat/nand-core.h> #include <plat/adc-core.h> +#include <plat/rtc-core.h> static struct map_desc s3c2416_iodesc[] __initdata = { IODESC_ENT(WATCHDOG), @@ -98,6 +99,7 @@ int __init s3c2416_init(void) s3c_fb_setname("s3c2443-fb"); s3c_adc_setname("s3c2416-adc"); + s3c_rtc_setname("s3c2416-rtc"); #ifdef CONFIG_PM register_syscore_ops(&s3c2416_pm_syscore_ops); |