diff options
| author |   Rob Herring <robh@kernel.org> | 2015-06-02 17:46:42 -0500 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2015-06-21 21:54:14 +0200 |
| commit | 01306aeadd75f8202bbeb66bf3da56b431364519 (patch) | |
| tree | 2593d366fc7f3c12707f2ff9cfa87ac0362d650b /arch/mips/include/asm/prom.h | |
| parent | MIPS: R12000: Enable branch prediction global history (diff) | |
| download | linux-dev-01306aeadd75f8202bbeb66bf3da56b431364519.tar.xz linux-dev-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/include/asm/prom.h')
| -rw-r--r-- | arch/mips/include/asm/prom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h index 8ebc2aa5f3e1..0b4b668925f6 100644 --- 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> |