diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/asm-mips/mips-boards/generic.h | |
parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'include/asm-mips/mips-boards/generic.h')
-rw-r--r-- | include/asm-mips/mips-boards/generic.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h index 33407bee4e7..7f0b034dd9a 100644 --- a/include/asm-mips/mips-boards/generic.h +++ b/include/asm-mips/mips-boards/generic.h | |||
@@ -27,12 +27,8 @@ | |||
27 | /* | 27 | /* |
28 | * Display register base. | 28 | * Display register base. |
29 | */ | 29 | */ |
30 | #ifdef CONFIG_MIPS_SEAD | ||
31 | #define ASCII_DISPLAY_POS_BASE 0x1f0005c0 | ||
32 | #else | ||
33 | #define ASCII_DISPLAY_WORD_BASE 0x1f000410 | 30 | #define ASCII_DISPLAY_WORD_BASE 0x1f000410 |
34 | #define ASCII_DISPLAY_POS_BASE 0x1f000418 | 31 | #define ASCII_DISPLAY_POS_BASE 0x1f000418 |
35 | #endif | ||
36 | 32 | ||
37 | 33 | ||
38 | /* | 34 | /* |
@@ -44,13 +40,8 @@ | |||
44 | /* | 40 | /* |
45 | * Reset register. | 41 | * Reset register. |
46 | */ | 42 | */ |
47 | #ifdef CONFIG_MIPS_SEAD | ||
48 | #define SOFTRES_REG 0x1e800050 | ||
49 | #define GORESET 0x4d | ||
50 | #else | ||
51 | #define SOFTRES_REG 0x1f000500 | 43 | #define SOFTRES_REG 0x1f000500 |
52 | #define GORESET 0x42 | 44 | #define GORESET 0x42 |
53 | #endif | ||
54 | 45 | ||
55 | /* | 46 | /* |
56 | * Revision register. | 47 | * Revision register. |