diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /arch/mips/vr41xx/common/init.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/vr41xx/common/init.c')
| -rw-r--r-- | arch/mips/vr41xx/common/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c index 707bd0933eed..915bfa5c0719 100644 --- a/arch/mips/vr41xx/common/init.c +++ b/arch/mips/vr41xx/common/init.c | |||
| @@ -58,7 +58,7 @@ static void __init timer_init(void) | |||
| 58 | board_timer_setup = setup_timer_irq; | 58 | board_timer_setup = setup_timer_irq; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | void __init plat_setup(void) | 61 | void __init plat_mem_setup(void) |
| 62 | { | 62 | { |
| 63 | vr41xx_calculate_clock_frequency(); | 63 | vr41xx_calculate_clock_frequency(); |
| 64 | 64 | ||