Merge remote-tracking branch 'xtensa/for_next'

[deliverable/linux.git] / arch / xtensa / kernel / setup.c

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 393206b6aabc8b9b48116c4d81fdb9a84fa6b76c..5b38d0431ba49b2d5f0c70473ac53dadbca870da 100644 (file)
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -27,7 +27,6 @@
 #include <linux/cpu.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
-#include <linux/of_platform.h>
 
 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
 # include <linux/console.h>
@@ -250,7 +249,6 @@ void __init early_init_devtree(void *params)
 static int __init xtensa_device_probe(void)
 {
        of_clk_init(NULL);
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
        return 0;
 }