diff options
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/sn/sn0/addrs.h | 6 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/arch.h | 4 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubmd.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h index 0ee8cbcb5b03..2c4b758f6736 100644 --- a/include/asm-mips/sn/sn0/addrs.h +++ b/include/asm-mips/sn/sn0/addrs.h | |||
@@ -49,7 +49,7 @@ | |||
49 | * so for now we just use defines bracketed by an ifdef. | 49 | * so for now we just use defines bracketed by an ifdef. |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #ifdef CONFIG_SGI_SN0_N_MODE | 52 | #ifdef CONFIG_SGI_SN_N_MODE |
53 | 53 | ||
54 | #define NODE_SIZE_BITS 31 | 54 | #define NODE_SIZE_BITS 31 |
55 | #define BWIN_SIZE_BITS 28 | 55 | #define BWIN_SIZE_BITS 28 |
@@ -63,7 +63,7 @@ | |||
63 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) | 63 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) |
64 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) | 64 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) |
65 | 65 | ||
66 | #else /* !defined(CONFIG_SGI_SN0_N_MODE), assume that M-mode is desired */ | 66 | #else /* !defined(CONFIG_SGI_SN_N_MODE), assume that M-mode is desired */ |
67 | 67 | ||
68 | #define NODE_SIZE_BITS 32 | 68 | #define NODE_SIZE_BITS 32 |
69 | #define BWIN_SIZE_BITS 29 | 69 | #define BWIN_SIZE_BITS 29 |
@@ -77,7 +77,7 @@ | |||
77 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) | 77 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) |
78 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) | 78 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) |
79 | 79 | ||
80 | #endif /* !defined(CONFIG_SGI_SN0_N_MODE) */ | 80 | #endif /* !defined(CONFIG_SGI_SN_N_MODE) */ |
81 | 81 | ||
82 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) | 82 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) |
83 | 83 | ||
diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h index 5643a6e639bd..0ecbaa0d3837 100644 --- a/include/asm-mips/sn/sn0/arch.h +++ b/include/asm-mips/sn/sn0/arch.h | |||
@@ -57,9 +57,9 @@ | |||
57 | /* | 57 | /* |
58 | * Slot constants for SN0 | 58 | * Slot constants for SN0 |
59 | */ | 59 | */ |
60 | #ifdef CONFIG_SGI_SN0_N_MODE | 60 | #ifdef CONFIG_SGI_SN_N_MODE |
61 | #define MAX_MEM_SLOTS 16 /* max slots per node */ | 61 | #define MAX_MEM_SLOTS 16 /* max slots per node */ |
62 | #else /* !CONFIG_SGI_SN0_N_MODE, assume M_MODE */ | 62 | #else /* !CONFIG_SGI_SN_N_MODE, assume M_MODE */ |
63 | #define MAX_MEM_SLOTS 32 /* max slots per node */ | 63 | #define MAX_MEM_SLOTS 32 /* max slots per node */ |
64 | #endif /* defined(N_MODE) */ | 64 | #endif /* defined(N_MODE) */ |
65 | 65 | ||
diff --git a/include/asm-mips/sn/sn0/hubmd.h b/include/asm-mips/sn/sn0/hubmd.h index a66def4e0ba0..1006aa26d771 100644 --- a/include/asm-mips/sn/sn0/hubmd.h +++ b/include/asm-mips/sn/sn0/hubmd.h | |||
@@ -92,7 +92,7 @@ | |||
92 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ | 92 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ |
93 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ | 93 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ |
94 | 94 | ||
95 | #ifdef CONFIG_SGI_SN0_N_MODE | 95 | #ifdef CONFIG_SGI_SN_N_MODE |
96 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ | 96 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ |
97 | #else | 97 | #else |
98 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ | 98 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ |