diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:49:18 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:49:18 +0900 |
commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /drivers/rtc/Kconfig | |
parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
download | linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.gz linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.bz2 linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.zip |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r-- | drivers/rtc/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 10ba12c8c5e0..c43732ff1800 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -645,9 +645,16 @@ config RTC_DRV_OMAP DA8xx/OMAP-L13x chips. This driver can also be built as a module called rtc-omap. +config HAVE_S3C_RTC + bool + help + This will include RTC support for Samsung SoCs. If + you want to include RTC support for any machine, kindly + select this in the respective mach-XXXX/Kconfig file. + config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC" - depends on ARCH_S3C2410 || ARCH_S3C64XX + depends on ARCH_S3C2410 || 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 |