X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Frtc%2FKconfig;h=6cc2c0330230fefc372193e275b7748aee32c112;hb=5f78e4d33945b291d12765cdd7e4304f437b9361;hp=9e7de63b26ef6c3c5c558c935bfaae28e3df1f3f;hpb=399f486286f44d55c4fff0e9cc5d712f2b443489;p=linux-2.6

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9e7de63b26..6cc2c03302 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,10 +20,6 @@ menuconfig RTC_CLASS
 
 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.