]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: prepare for user enabling of CONFIG_OF
authorRob Herring <robh@kernel.org>
Tue, 2 Jun 2015 22:46:42 +0000 (17:46 -0500)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 21 Jun 2015 19:54:14 +0000 (21:54 +0200)
commit9cb2bd48b57eec7d24f775bfb4009bdf4b433296
tree2593d366fc7f3c12707f2ff9cfa87ac0362d650b
parent84bb2790cf50259484972f7635bbbf4ff2032d8e
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>
arch/mips/include/asm/prom.h
arch/mips/kernel/prom.c