diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /arch/mips/momentum/jaguar_atx/setup.c | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'arch/mips/momentum/jaguar_atx/setup.c')
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 1379c76845dc..df1485501ce6 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
| @@ -359,7 +359,7 @@ static __init int __init ja_pci_init(void) | |||
| 359 | 359 | ||
| 360 | arch_initcall(ja_pci_init); | 360 | arch_initcall(ja_pci_init); |
| 361 | 361 | ||
| 362 | void __init plat_setup(void) | 362 | void __init plat_mem_setup(void) |
| 363 | { | 363 | { |
| 364 | unsigned int tmpword; | 364 | unsigned int tmpword; |
| 365 | 365 | ||