diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 17:01:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 17:01:21 -0400 |
| commit | d0a9af809124c432297a7c4a3bcf98cbfdb4036a (patch) | |
| tree | f11ed44faa2a4085d9bef84fc5eee89bc488dfd1 /include | |
| parent | c203b33d2ee34594f6656c033cddd4f5860eb06c (diff) | |
| parent | a71775147f6ae2a2901e7b917c0a76df353f8801 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[VIDEO]: Fix section mismatch in cg3.c
[SPARC]: sparc64 gcc-4.2.0 20070317 -Werror failure
[VIDEO] ffb: Fix two DAC handling bugs.
[SPARC32]: Fix SMP build regression
[DRM]: Delete sparc64 FFB driver code that never gets built.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/mostek.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/mostek.h | 2 |
2 files changed, 2 insertions, 2 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; | |||
| 87 | #define MSTK_DOW_MASK 0x07 | 87 | #define MSTK_DOW_MASK 0x07 |
| 88 | #define MSTK_DOM_MASK 0x3f | 88 | #define MSTK_DOM_MASK 0x3f |
| 89 | #define MSTK_MONTH_MASK 0x1f | 89 | #define MSTK_MONTH_MASK 0x1f |
| 90 | #define MSTK_YEAR_MASK 0xff | 90 | #define MSTK_YEAR_MASK 0xffU |
| 91 | 91 | ||
| 92 | /* Binary coded decimal conversion macros. */ | 92 | /* Binary coded decimal conversion macros. */ |
| 93 | #define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04)) | 93 | #define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04)) |
diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h index 09b5aba6678a..d14dd8988161 100644 --- a/include/asm-sparc64/mostek.h +++ b/include/asm-sparc64/mostek.h | |||
| @@ -89,7 +89,7 @@ extern void __iomem *mstk48t02_regs; | |||
| 89 | #define MSTK_DOW_MASK 0x07 | 89 | #define MSTK_DOW_MASK 0x07 |
| 90 | #define MSTK_DOM_MASK 0x3f | 90 | #define MSTK_DOM_MASK 0x3f |
| 91 | #define MSTK_MONTH_MASK 0x1f | 91 | #define MSTK_MONTH_MASK 0x1f |
| 92 | #define MSTK_YEAR_MASK 0xff | 92 | #define MSTK_YEAR_MASK 0xffU |
| 93 | 93 | ||
| 94 | /* Binary coded decimal conversion macros. */ | 94 | /* Binary coded decimal conversion macros. */ |
| 95 | #define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04)) | 95 | #define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04)) |