Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 13128a89657b73302687dc90391c0ae791713171..e215f50794b68f857ba4d9cfb86755727735dec1 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -5,6 +5,10 @@
 config RTC_LIB
        bool
 
+config RTC_MC146818_LIB
+       bool
+       select RTC_LIB
+
 menuconfig RTC_CLASS
        bool "Real Time Clock"
        default n
@@ -574,10 +578,10 @@ config RTC_DRV_EM3027
          will be called rtc-em3027.
 
 config RTC_DRV_RV8803
-       tristate "Micro Crystal RV8803"
+       tristate "Micro Crystal RV8803, Epson RX8900"
        help
-         If you say yes here you get support for the Micro Crystal
-         RV8803 RTC chips.
+         If you say yes here you get support for the Micro Crystal RV8803 and
+         Epson RX8900 RTC chips.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-rv8803.
@@ -809,6 +813,7 @@ config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
        depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 || MN10300
        default y if X86
+       select RTC_MC146818_LIB
        help
          Say "yes" here to get direct support for the real time clock
          found in every PC or ACPI-based system, and some other boards.
@@ -827,6 +832,7 @@ config RTC_DRV_CMOS
 config RTC_DRV_ALPHA
        bool "Alpha PC-style CMOS"
        depends on ALPHA
+       select RTC_MC146818_LIB
        default y
        help
          Direct support for the real-time clock found on every Alpha