summaryrefslogtreecommitdiff
path: root/arch/mips/tx4938/common/setup.c
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-06-21 13:43:50 -0700
committerAuke-jan Kok <ahkok@gitlost.site>2006-06-21 13:43:50 -0700
commit0d204094d15dac2e8a439b993f71eda385b4dccd (patch)
tree647f0ddec94d0fb4aaf74fa55bcad75946030f8a /arch/mips/tx4938/common/setup.c
parenta487a8f7b6947f6445e5a1aa876522916785d5ec (diff)
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
downloadlwn-0d204094d15dac2e8a439b993f71eda385b4dccd.tar.gz
lwn-0d204094d15dac2e8a439b993f71eda385b4dccd.zip
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/mips/tx4938/common/setup.c')
-rw-r--r--arch/mips/tx4938/common/setup.c2
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)
}
void __init
-plat_setup(void)
+plat_mem_setup(void)
{
board_time_init = tx4938_time_init;
board_timer_setup = tx4938_timer_setup;