aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-03 08:57:03 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-03-07 01:36:33 -0800
commit880bcd4a8363f24375027f9ded4670960dcfa70a (patch)
tree31894d9dc2c29f31234e479de520a50858cce54c /drivers/rtc
parentMerge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff)
parentARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx (diff)
downloadlinux-dev-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.xz
linux-dev-880bcd4a8363f24375027f9ded4670960dcfa70a.zip
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts: arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/Kconfig2
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