diff options
| author | Rob Herring | 2015-06-03 00:46:42 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2015-06-21 21:54:14 +0200 |
| commit | 01306aeadd75f8202bbeb66bf3da56b431364519 (patch) | |
| tree | 2593d366fc7f3c12707f2ff9cfa87ac0362d650b /arch/mips/kernel/prom.c | |
| parent | MIPS: R12000: Enable branch prediction global history (diff) | |
| download | kernel-qcow2-linux-01306aeadd75f8202bbeb66bf3da56b431364519.tar.gz kernel-qcow2-linux-01306aeadd75f8202bbeb66bf3da56b431364519.tar.xz kernel-qcow2-linux-01306aeadd75f8202bbeb66bf3da56b431364519.zip | |
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>
Diffstat (limited to 'arch/mips/kernel/prom.c')
| -rw-r--r-- | arch/mips/kernel/prom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index e303cb1ef2f4..b130033838ba 100644 --- 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> |