s390: use non-racy method for proc entries creation

[linux-2.6] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6402d699072b5a28a11069a5188dd2e34245a079..6cc2c0330230fefc372193e275b7748aee32c112 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
@@ -250,6 +246,16 @@ config RTC_DRV_TWL92330
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
 
+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.
+
+         This driver can also be built as a module. If so the module
+         will be called rtc-s35390a.
+
 endif # I2C
 
 comment "SPI RTC drivers"
@@ -294,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.