Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

1 files changed, 3 insertions, 5 deletions

diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 0a1dd9bbc02e..625843b30bed 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -50,8 +50,10 @@ const char *get_system_type(void)
         return "MIPS Atlas";
 }
 
-static int __init atlas_setup(void)
+void __init plat_setup(void)
 {
+        mips_pcibios_init();
+
         ioport_resource.end = 0x7fffffff;
 
         serial_init ();
@@ -64,12 +66,8 @@ static int __init atlas_setup(void)
         board_time_init = mips_time_init;
         board_timer_setup = mips_timer_setup;
         rtc_get_time = mips_rtc_get_time;
-
-        return 0;
 }
 
-early_initcall(atlas_setup);
-
 static void __init serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250