diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/mips/sgi-ip22/ip22-mc.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-mc.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c index ddb6506d8341..01a805dcc67c 100644 --- a/arch/mips/sgi-ip22/ip22-mc.c +++ b/arch/mips/sgi-ip22/ip22-mc.c | |||
| @@ -47,7 +47,7 @@ struct mem { | |||
| 47 | /* | 47 | /* |
| 48 | * Detect installed memory, do some sanity checks and notify kernel about it | 48 | * Detect installed memory, do some sanity checks and notify kernel about it |
| 49 | */ | 49 | */ |
| 50 | static void probe_memory(void) | 50 | static void __init probe_memory(void) |
| 51 | { | 51 | { |
| 52 | int i, j, found, cnt = 0; | 52 | int i, j, found, cnt = 0; |
| 53 | struct mem bank[4]; | 53 | struct mem bank[4]; |