git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
core_marvel.c
diff --git
a/arch/alpha/kernel/core_marvel.c
b/arch/alpha/kernel/core_marvel.c
index
04dcc5e
..
9cd8dca
100644
(file)
--- a/
arch/alpha/kernel/core_marvel.c
+++ b/
arch/alpha/kernel/core_marvel.c
@@
-655,7
+655,7
@@
__marvel_rtc_io(u8 b, unsigned long addr, int write)
case 0x71: /* RTC_PORT(1) */
rtc_access.index = index;
case 0x71: /* RTC_PORT(1) */
rtc_access.index = index;
- rtc_access.data =
BCD_TO_BIN
(b);
+ rtc_access.data =
bcd2bin
(b);
rtc_access.function = 0x48 + !write; /* GET/PUT_TOY */
#ifdef CONFIG_SMP
rtc_access.function = 0x48 + !write; /* GET/PUT_TOY */
#ifdef CONFIG_SMP
@@
-668,7
+668,7
@@
__marvel_rtc_io(u8 b, unsigned long addr, int write)
#else
__marvel_access_rtc(&rtc_access);
#endif
#else
__marvel_access_rtc(&rtc_access);
#endif
- ret =
BIN_TO_BCD
(rtc_access.data);
+ ret =
bin2bcd
(rtc_access.data);
break;
default:
break;
default: