diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-30 20:57:51 +0200 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-06-04 00:20:07 +0200 |
commit | 463a86304cae92e10277b47180ac59cf93982e5b (patch) | |
tree | 06db025f072518df97d2127a67dd921024d0838b /arch/x86/kernel/rtc.c | |
parent | 5ab788d7383289bfc141ab357767bc6c11bbf77f (diff) | |
download | linux-stable-463a86304cae92e10277b47180ac59cf93982e5b.tar.gz linux-stable-463a86304cae92e10277b47180ac59cf93982e5b.tar.bz2 linux-stable-463a86304cae92e10277b47180ac59cf93982e5b.zip |
char/genrtc: x86: remove remnants of asm/rtc.h
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'arch/x86/kernel/rtc.c')
-rw-r--r-- | arch/x86/kernel/rtc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index eceaa082ec3f..79c6311cd912 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -13,7 +13,6 @@ #include <asm/x86_init.h> #include <asm/time.h> #include <asm/intel-mid.h> -#include <asm/rtc.h> #include <asm/setup.h> #ifdef CONFIG_X86_32 @@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now) rtc_time_to_tm(nowtime, &tm); if (!rtc_valid_tm(&tm)) { - retval = set_rtc_time(&tm); + retval = mc146818_set_time(&tm); if (retval) printk(KERN_ERR "%s: RTC write failed with error %d\n", __func__, retval); |