diff options
Diffstat (limited to 'arch/mn10300')
-rw-r--r-- | arch/mn10300/Kconfig | 2 | ||||
-rw-r--r-- | arch/mn10300/kernel/rtc.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index dd557c9cf001..9a9f43358879 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -68,6 +68,8 @@ mainmenu "Matsushita MN10300/AM33 Kernel Configuration" | |||
68 | 68 | ||
69 | source "init/Kconfig" | 69 | source "init/Kconfig" |
70 | 70 | ||
71 | source "kernel/Kconfig.freezer" | ||
72 | |||
71 | 73 | ||
72 | menu "Matsushita MN10300 system setup" | 74 | menu "Matsushita MN10300 system setup" |
73 | 75 | ||
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c index 042f792d8430..7978470b5749 100644 --- a/arch/mn10300/kernel/rtc.c +++ b/arch/mn10300/kernel/rtc.c | |||
@@ -67,7 +67,7 @@ static int set_rtc_mmss(unsigned long nowtime) | |||
67 | 67 | ||
68 | cmos_minutes = CMOS_READ(RTC_MINUTES); | 68 | cmos_minutes = CMOS_READ(RTC_MINUTES); |
69 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | 69 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) |
70 | BCD_TO_BIN(cmos_minutes); | 70 | cmos_minutes = bcd2bin(cmos_minutes); |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * since we're only adjusting minutes and seconds, | 73 | * since we're only adjusting minutes and seconds, |
@@ -84,8 +84,8 @@ static int set_rtc_mmss(unsigned long nowtime) | |||
84 | 84 | ||
85 | if (abs(real_minutes - cmos_minutes) < 30) { | 85 | if (abs(real_minutes - cmos_minutes) < 30) { |
86 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 86 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
87 | BIN_TO_BCD(real_seconds); | 87 | real_seconds = bin2bcd(real_seconds); |
88 | BIN_TO_BCD(real_minutes); | 88 | real_minutes = bin2bcd(real_minutes); |
89 | } | 89 | } |
90 | CMOS_WRITE(real_seconds, RTC_SECONDS); | 90 | CMOS_WRITE(real_seconds, RTC_SECONDS); |
91 | CMOS_WRITE(real_minutes, RTC_MINUTES); | 91 | CMOS_WRITE(real_minutes, RTC_MINUTES); |