From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 12 Oct 2015 11:13:01 +0000 (+0200)
Subject: MIPS: Use USE_OF as the guard for appended dtb
X-Git-Tag: v4.4-rc1~6^2~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5b24d52ce23d1c7a5c2bd884e57463e266eb8b85;p=linux-2.6-block.git

MIPS: Use USE_OF as the guard for appended dtb

Since OF is now a user selectable symbol, the choice for appended dtb
support should only be visible when USE_OF is selected, as this
indicates actual machine support for device tree in MIPS.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: Ganesan Ramalingam <ganesanr@broadcom.com>
Cc: Jayachandran C <jchandra@broadcom.com>
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: James Hartley <james.hartley@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/11283/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 10feb1520b0c..8b8cd97cdff9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2705,7 +2705,7 @@ config BUILTIN_DTB
 	bool
 
 choice
-	prompt "Kernel appended dtb support" if OF
+	prompt "Kernel appended dtb support" if USE_OF
 	default MIPS_NO_APPENDED_DTB
 
 	config MIPS_NO_APPENDED_DTB