diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-12 19:50:03 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 19:50:03 +0200 |
commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /include/asm-sparc/mostek.h | |
parent | [POWERPC] 85xx: Add initial MPC8544DS basic port defconfig. (diff) | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.tar.xz linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.zip |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-sparc/mostek.h')
-rw-r--r-- | include/asm-sparc/mostek.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/mostek.h b/include/asm-sparc/mostek.h index bd92a78f4937..958d0513a6d4 100644 --- a/include/asm-sparc/mostek.h +++ b/include/asm-sparc/mostek.h @@ -87,7 +87,7 @@ extern void __iomem *mstk48t02_regs; #define MSTK_DOW_MASK 0x07 #define MSTK_DOM_MASK 0x3f #define MSTK_MONTH_MASK 0x1f -#define MSTK_YEAR_MASK 0xff +#define MSTK_YEAR_MASK 0xffU /* Binary coded decimal conversion macros. */ #define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04)) |