rtc: class driver for ppc_md RTC functions

[linux-2.6-omap-h63xx.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 82f5ad9c3af479a86e711819b8cea6ddfc42f947..60f8afc7a56ee643209b133e7eaa88042ff2e001 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -16,14 +16,10 @@ menuconfig RTC_CLASS
          probably want to enable one or more of the interfaces below.
 
          This driver can also be built as a module. If so, the module
-         will be called rtc-class.
+         will be called rtc-core.
 
 if RTC_CLASS
 
-if GEN_RTC || RTC
-comment "Conflicting RTC option has been selected, check GEN_RTC and RTC"
-endif
-
 config RTC_HCTOSYS
        bool "Set system time from RTC on startup and resume"
        depends on RTC_CLASS = y
@@ -252,6 +248,7 @@ config RTC_DRV_TWL92330
 
 config RTC_DRV_S35390A
        tristate "Seiko Instruments S-35390A"
+       select BITREVERSE
        help
          If you say yes here you will get support for the Seiko
          Instruments S-35390A.
@@ -303,6 +300,7 @@ comment "Platform RTC drivers"
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
        depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS
+       default y if X86
        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.
@@ -536,4 +534,12 @@ config RTC_DRV_RS5C313
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
+config RTC_DRV_PPC
+       tristate "PowerPC machine dependent RTC support"
+       depends on PPC_MERGE
+       help
+        The PowerPC kernel has machine-specific functions for accessing
+        the RTC. This exposes that functionality through the generic RTC
+        class.
+
 endif # RTC_CLASS