diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
| commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
| tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /arch/arm/include | |
| parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
| parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/setup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index ee1304f22f94..5ccce0a9b03c 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h | |||
| @@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } | |||
| 201 | struct membank { | 201 | struct membank { |
| 202 | unsigned long start; | 202 | unsigned long start; |
| 203 | unsigned long size; | 203 | unsigned long size; |
| 204 | int node; | 204 | unsigned short node; |
| 205 | unsigned short highmem; | ||
| 205 | }; | 206 | }; |
| 206 | 207 | ||
| 207 | struct meminfo { | 208 | struct meminfo { |