diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-28 17:20:39 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 17:20:39 -0400 |
commit | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (patch) | |
tree | fb5dc6df00065f11578f837835c6d5a99530b223 /include/asm-arm/setup.h | |
parent | 84904d0ead0a8c419abd45c7b2ac8d76d50a0d48 (diff) | |
parent | 6afd6fae1d5f7e7129a10c4f3e32018966eeac1c (diff) |
Merge nommu branch
Diffstat (limited to 'include/asm-arm/setup.h')
-rw-r--r-- | include/asm-arm/setup.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h index ea3ed2465233..aa4b5782f0c9 100644 --- a/include/asm-arm/setup.h +++ b/include/asm-arm/setup.h | |||
@@ -194,13 +194,15 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } | |||
194 | # define NR_BANKS 8 | 194 | # define NR_BANKS 8 |
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | struct membank { | ||
198 | unsigned long start; | ||
199 | unsigned long size; | ||
200 | int node; | ||
201 | }; | ||
202 | |||
197 | struct meminfo { | 203 | struct meminfo { |
198 | int nr_banks; | 204 | int nr_banks; |
199 | struct { | 205 | struct membank bank[NR_BANKS]; |
200 | unsigned long start; | ||
201 | unsigned long size; | ||
202 | int node; | ||
203 | } bank[NR_BANKS]; | ||
204 | }; | 206 | }; |
205 | 207 | ||
206 | /* | 208 | /* |