diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 03:57:03 +0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 13:36:33 +0400 |
commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
tree | 31894d9dc2c29f31234e479de520a50858cce54c /drivers/rtc/Kconfig | |
parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
download | linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.xz |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r-- | drivers/rtc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 3a125b835546..c2365d45508d 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -748,7 +748,7 @@ config HAVE_S3C_RTC config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC" - depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC + depends on ARCH_S3C64XX || HAVE_S3C_RTC help RTC (Realtime Clock) driver for the clock inbuilt into the Samsung S3C24XX series of SoCs. This can provide periodic |