Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Rob Herring and committed by
Ralf Baechle
01306aea 8d5ded16

+2 -1
+1 -1
arch/mips/include/asm/prom.h
··· 11 11 #ifndef __ASM_PROM_H 12 12 #define __ASM_PROM_H 13 13 14 - #ifdef CONFIG_OF 14 + #ifdef CONFIG_USE_OF 15 15 #include <linux/bug.h> 16 16 #include <linux/io.h> 17 17 #include <linux/types.h>
+1
arch/mips/kernel/prom.c
··· 18 18 #include <linux/of_fdt.h> 19 19 #include <linux/of_platform.h> 20 20 21 + #include <asm/bootinfo.h> 21 22 #include <asm/page.h> 22 23 #include <asm/prom.h> 23 24