diff options
author | Rob Herring <robh@kernel.org> | 2015-06-01 08:17:31 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-06-04 19:37:00 -0500 |
commit | 42ef89466b0bdfe5b08f8f603e3c924a8d7d9332 (patch) | |
tree | 5d259bee4c6fd309e5fa38f19fec0e83e4e63cdf /arch/mips/include/asm/prom.h | |
parent | e7a9a5bbaa78e92e6b76bdb51d4c4f6da35c0812 (diff) |
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
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> |