aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-10-27 10:19:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-10-27 10:19:43 -0700
commit646b0de5fe32306eaf5399647adf2177d4417021 (patch)
tree2d0087fc9df27f9e4fb4254090d9e94593bd9e79
parentab2aa486f48c79b0c9df77e3827922d29c60df0c (diff)
parent4a089e95b4d6bb625044d47aed0c442a8f7bd093 (diff)
downloadlinux-ft-646b0de5fe32306eaf5399647adf2177d4417021.tar.gz
Merge tag 'nios2_fixes_for_v5.15_part3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
Pull nios2 fix from Dinh Nguyen: "Fix a build error for allmodconfig" * tag 'nios2_fixes_for_v5.15_part3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST
-rw-r--r--arch/nios2/platform/Kconfig.platform1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/nios2/platform/Kconfig.platform b/arch/nios2/platform/Kconfig.platform
index 9e32fb7f3d4ce9..e849daff6fd162 100644
--- a/arch/nios2/platform/Kconfig.platform
+++ b/arch/nios2/platform/Kconfig.platform
@@ -37,6 +37,7 @@ config NIOS2_DTB_PHYS_ADDR
config NIOS2_DTB_SOURCE_BOOL
bool "Compile and link device tree into kernel image"
+ depends on !COMPILE_TEST
help
This allows you to specify a dts (device tree source) file
which will be compiled and linked into the kernel image.