diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /arch/mips/lasat/setup.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/lasat/setup.c')
| -rw-r--r-- | arch/mips/lasat/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index bb70a8240e61..3f64277429e4 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
| @@ -155,7 +155,7 @@ void __init serial_init(void) | |||
| 155 | } | 155 | } |
| 156 | #endif | 156 | #endif |
| 157 | 157 | ||
| 158 | void __init plat_setup(void) | 158 | void __init plat_mem_setup(void) |
| 159 | { | 159 | { |
| 160 | int i; | 160 | int i; |
| 161 | lasat_misc = &lasat_misc_info[mips_machtype]; | 161 | lasat_misc = &lasat_misc_info[mips_machtype]; |