diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /arch/mips/tx4938/common/setup.c | |
| parent | 9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/tx4938/common/setup.c')
| -rw-r--r-- | arch/mips/tx4938/common/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c index fc992953bf95..ef59a5cffc69 100644 --- a/arch/mips/tx4938/common/setup.c +++ b/arch/mips/tx4938/common/setup.c | |||
| @@ -61,7 +61,7 @@ tx4938_write_buffer_flush(void) | |||
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | void __init | 63 | void __init |
| 64 | plat_setup(void) | 64 | plat_mem_setup(void) |
| 65 | { | 65 | { |
| 66 | board_time_init = tx4938_time_init; | 66 | board_time_init = tx4938_time_init; |
| 67 | board_timer_setup = tx4938_timer_setup; | 67 | board_timer_setup = tx4938_timer_setup; |