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

[cascardo/linux.git] / arch / mips / pistachio / init.c

diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index 387b9df..1c91cad 100644 (file)
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #include <asm/cacheflush.h>
 #include <asm/dma-coherence.h>
@@ -134,15 +133,3 @@ void __init device_tree_init(void)
 
        unflatten_and_copy_device_tree();
 }
-
-static int __init plat_of_setup(void)
-{
-       if (!of_have_populated_dt())
-               panic("Device tree not present");
-
-       if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
-               panic("Failed to populate DT");
-
-       return 0;
-}
-arch_initcall(plat_of_setup);