2 files changed, 11 insertions, 5 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2906ee7bd298..929d4fa73fd9 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -732,9 +732,16 @@ config NVRAM
           To compile this driver as a module, choose M here: the
           module will be called nvram.
 
+#
+# These legacy RTC drivers just cause too many conflicts with the generic
+# RTC framework ... let's not even try to coexist any more.
+#
+if RTC_LIB=n
+
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390 && !AVR32
+        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
+                        && !ARM && !SUPERH && !S390 && !AVR32
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -840,6 +847,8 @@ config DS1302
           will get access to the real time clock (or hardware clock) built
           into your computer.
 
+endif # RTC_LIB
+
 config COBALT_LCD
         bool "Support for Cobalt LCD"
         depends on MIPS_COBALT
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 02a4c8cf2b2d..6cc2c0330230 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
@@ -304,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.