Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1156975
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF |
| Date | 2015-06-03 00:50 +0200 |
| Message-ID | <px3aq-6Sy-7@gated-at.bofh.it> (permalink) |
| References | <px3ap-6Sy-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 --- arch/mips/include/asm/prom.h | 2 +- arch/mips/kernel/prom.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h index 8ebc2aa..0b4b668 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> diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index e303cb1..b130033 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> -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/3] Make CONFIG_OF user selectable Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
[PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
[PATCH 3/3] of: make unittest select OF_EARLY_FLATTREE instead of depend on it Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
[PATCH 2/3] of: make CONFIG_OF user selectable Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
Re: [PATCH 2/3] of: make CONFIG_OF user selectable Geert Uytterhoeven <geert@linux-m68k.org> - 2015-06-03 08:50 +0200
csiph-web