diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/m68k | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/mvme16x/rtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index a69fe3048e..b0e4c084df 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/poll.h> | 17 | #include <linux/poll.h> |
| 18 | #include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ | 18 | #include <linux/mc146818rtc.h> /* For struct rtc_time and ioctls, etc */ |
| 19 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
| 20 | #include <linux/bcd.h> | ||
| 20 | #include <asm/mvme16xhw.h> | 21 | #include <asm/mvme16xhw.h> |
| 21 | 22 | ||
| 22 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| @@ -31,9 +32,6 @@ | |||
| 31 | * ioctls. | 32 | * ioctls. |
| 32 | */ | 33 | */ |
| 33 | 34 | ||
| 34 | #define BCD2BIN(val) (((val)&15) + ((val)>>4)*10) | ||
| 35 | #define BIN2BCD(val) ((((val)/10)<<4) + (val)%10) | ||
| 36 | |||
| 37 | static const unsigned char days_in_mo[] = | 35 | static const unsigned char days_in_mo[] = |
| 38 | {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; | 36 | {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; |
| 39 | 37 | ||