summaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/sim/sim_setup.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-20 11:19:40 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-20 11:19:40 -0400
commitd636b2798732f2cfba48d94aa19b7ba206268a83 (patch)
tree40dc52126ab5a1570a000321d93ca4bb03312684 /arch/mips/mips-boards/sim/sim_setup.c
parent9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff)
parent25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff)
downloadtalos-op-linux-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.gz
talos-op-linux-d636b2798732f2cfba48d94aa19b7ba206268a83.zip
Merge branch 'master'
Diffstat (limited to 'arch/mips/mips-boards/sim/sim_setup.c')
-rw-r--r--arch/mips/mips-boards/sim/sim_setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c
index a2fd62997ca3..15a5dac4ae19 100644
--- a/arch/mips/mips-boards/sim/sim_setup.c
+++ b/arch/mips/mips-boards/sim/sim_setup.c
@@ -50,7 +50,7 @@ const char *get_system_type(void)
return "MIPSsim";
}
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
{
set_io_port_base(0xbfd00000);
OpenPOWER on IntegriCloud