git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
m68k
/
mvme16x
/
rtc.c
diff --git
a/arch/m68k/mvme16x/rtc.c
b/arch/m68k/mvme16x/rtc.c
index
b0e4c08
..
a69fe30
100644
(file)
--- a/
arch/m68k/mvme16x/rtc.c
+++ b/
arch/m68k/mvme16x/rtc.c
@@
-17,7
+17,6
@@
#include <linux/poll.h>
#include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */
#include <linux/smp_lock.h>
#include <linux/poll.h>
#include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */
#include <linux/smp_lock.h>
-#include <linux/bcd.h>
#include <asm/mvme16xhw.h>
#include <asm/io.h>
#include <asm/mvme16xhw.h>
#include <asm/io.h>
@@
-32,6
+31,9
@@
* ioctls.
*/
* ioctls.
*/
+#define BCD2BIN(val) (((val)&15) + ((val)>>4)*10)
+#define BIN2BCD(val) ((((val)/10)<<4) + (val)%10)
+
static const unsigned char days_in_mo[] =
{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
static const unsigned char days_in_mo[] =
{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};