Merge branch 'master' into upstream

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 7ff1d88094b6..33a7b720539b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -238,6 +238,16 @@ config RTC_DRV_SA1100
           To compile this driver as a module, choose M here: the
           module will be called rtc-sa1100.
 
+config RTC_DRV_SH
+        tristate "SuperH On-Chip RTC"
+        depends on RTC_CLASS && SUPERH
+        help
+          Say Y here to enable support for the on-chip RTC found in
+          most SuperH processors.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rtc-sh.
+
 config RTC_DRV_VR41XX
         tristate "NEC VR41XX"
         depends on RTC_CLASS && CPU_VR41XX