From: David Brownell This is a harsher fix for the problems of trying to make legacy RTCs coexist with the generic RTC framework: Just Don't Do It. The legacy drivers are not geared towards coexistence; they never had a reason to try. So rather than accumulating more and more special cases, and gently nudging users away from the old code, make it be an either/or choice. Signed-off-by: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton --- drivers/char/Kconfig | 12 ++++++++---- drivers/rtc/Kconfig | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/char/Kconfig~rtc-avoid-legacy-drivers-with-generic-framework-update drivers/char/Kconfig --- a/drivers/char/Kconfig~rtc-avoid-legacy-drivers-with-generic-framework-update +++ a/drivers/char/Kconfig @@ -713,14 +713,16 @@ config NVRAM To compile this driver as a module, choose M here: the module will be called nvram. -comment "Avoid any legacy RTC drivers you may see here" - depends on RTC_LIB +# +# 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 \ - && RTC_DRV_CMOS=n + && !ARM && !SUPERH && !S390 ---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 @@ -826,6 +828,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 -puN drivers/rtc/Kconfig~rtc-avoid-legacy-drivers-with-generic-framework-update drivers/rtc/Kconfig --- a/drivers/rtc/Kconfig~rtc-avoid-legacy-drivers-with-generic-framework-update +++ a/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 _