diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-03-23 12:00:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:38:08 +0100 |
| commit | b8e31edc10d160a8bf2159541d9d12f2079a0887 (patch) | |
| tree | 82509ee100b594837024b2c28f586f995e1919da /arch/m68k/bvme6000/rtc.c | |
| parent | [PATCH] swsusp: add s2ram ioctl to userland interface (diff) | |
| download | linux-b8e31edc10d160a8bf2159541d9d12f2079a0887.tar.xz linux-b8e31edc10d160a8bf2159541d9d12f2079a0887.zip | |
[PATCH] m68k: rtc driver cleanup
Use the standard BCD macros instead of redefining them.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/m68k/bvme6000/rtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index 703cbc6dc9cc..15c16b62dff5 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c @@ -18,6 +18,7 @@ #include <linux/module.h> #include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ #include <linux/smp_lock.h> +#include <linux/bcd.h> #include <asm/bvme6000hw.h> #include <asm/io.h> @@ -32,9 +33,6 @@ * ioctls. */ -#define BCD2BIN(val) (((val)&15) + ((val)>>4)*10) -#define BIN2BCD(val) ((((val)/10)<<4) + (val)%10) - static unsigned char days_in_mo[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; |