Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ef8946 authored Jun 01, 2015 by Rob Herring

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

parent e7a9a5bb

arch/mips/include/asm/prom.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,7 @@
	#ifndef __ASM_PROM_H		#ifndef __ASM_PROM_H
	#define __ASM_PROM_H		#define __ASM_PROM_H

	#ifdef CONFIG_OF		#ifdef CONFIG_USE_OF
	#include <linux/bug.h>		#include <linux/bug.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/types.h>		#include <linux/types.h>

arch/mips/kernel/prom.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#include <linux/of_fdt.h>		#include <linux/of_fdt.h>
	#include <linux/of_platform.h>		#include <linux/of_platform.h>

			#include <asm/bootinfo.h>
	#include <asm/page.h>		#include <asm/page.h>
	#include <asm/prom.h>		#include <asm/prom.h>