Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[sfrench/cifs-2.6.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e11e1cda4ba2308fd7680eaddb1b1f60101dc3ef..f2e1004d12c7807f56b129e221a36c23cdc1c3bf 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -509,6 +509,15 @@ config RTC_DRV_M48T59
          This driver can also be built as a module, if so, the module
          will be called "rtc-m48t59".
 
+config RTC_DRV_MSM6242
+       tristate "Oki MSM6242"
+       help
+         If you say yes here you get support for the Oki MSM6242
+         timekeeping chip. It is used in some Amiga models (e.g. A2000).
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-msm6242.
+
 config RTC_MXC
        tristate "Freescale MXC Real Time Clock"
        depends on ARCH_MXC
@@ -529,6 +538,16 @@ config RTC_DRV_BQ4802
          This driver can also be built as a module. If so, the module
          will be called rtc-bq4802.
 
+config RTC_DRV_RP5C01
+       tristate "Ricoh RP5C01"
+       help
+         If you say yes here you get support for the Ricoh RP5C01
+         timekeeping chip. It is used in some Amiga models (e.g. A3000
+         and A4000).
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-rp5c01.
+
 config RTC_DRV_V3020
        tristate "EM Microelectronic V3020"
        help