MIPS: prepare for user enabling of CONFIG_OF

In preparation to allow users to enable DeviceTree without arch or machine selecting it, we need to fix build errors on MIPS. When CONFIG_OF is enabled, device_tree_init cannot be resolved. This is trivially fixed by using CONFIG_USE_OF instead of CONFIG_OF for prom.h. Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Grant Likely <grant.likely@lianro.org> Cc: linux-mips@linux-mips.org
mariux64 · Jun 5, 2015 · 42ef894 · 42ef894
1 parent e7a9a5b
commit 42ef894
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
@@ -11,7 +11,7 @@
 #ifndef __ASM_PROM_H
 #define __ASM_PROM_H
 
-#ifdef CONFIG_OF
+#ifdef CONFIG_USE_OF
 #include <linux/bug.h>
 #include <linux/io.h>
 #include <linux/types.h>

diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
@@ -18,6 +18,7 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
+#include <asm/bootinfo.h>
 #include <asm/page.h>
 #include <asm/prom.h>