Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 166232a3f56bf18cf9287d9057a04f1f91ab46a2..65d090dbef460e70ccb4aae266e08ff8ba7576c7 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -117,6 +117,16 @@ config RTC_DRV_RS5C372
          This driver can also be built as a module. If so, the module
          will be called rtc-rs5c372.
 
+config RTC_DRV_M48T86
+       tristate "ST M48T86/Dallas DS12887"
+       depends on RTC_CLASS
+       help
+         If you say Y here you will get support for the
+         ST M48T86 and Dallas DS12887 RTC chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-m48t86.
+
 config RTC_DRV_EP93XX
        tristate "Cirrus Logic EP93XX"
        depends on RTC_CLASS && ARCH_EP93XX
@@ -137,6 +147,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_VR41XX
+       tristate "NEC VR41XX"
+       depends on RTC_CLASS && CPU_VR41XX
+       help
+         If you say Y here you will get access to the real time clock
+         built into your NEC VR41XX CPU.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rtc-vr41xx.
+
 config RTC_DRV_TEST
        tristate "Test driver/device"
        depends on RTC_CLASS