summaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/atlas/atlas_setup.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-20 20:36:38 +0000
committerSteve French <sfrench@us.ibm.com>2006-06-20 20:36:38 +0000
commit75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch)
treec2f02ee30609d0d69308b4ca80d68d02a5f85552 /arch/mips/mips-boards/atlas/atlas_setup.c
parent0fd1ffe0633b4b039b343b753598e6df435e034d (diff)
parent25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff)
downloadop-kernel-dev-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.zip
op-kernel-dev-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.gz
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/mips-boards/atlas/atlas_setup.c')
-rw-r--r--arch/mips/mips-boards/atlas/atlas_setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index c20d401..8cc9eff 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -50,7 +50,7 @@ const char *get_system_type(void)
return "MIPS Atlas";
}
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
{
mips_pcibios_init();
OpenPOWER on IntegriCloud