summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Gouders <dirk@gouders.net>2018-08-02 15:47:08 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-03 00:47:00 +0900
commitb5cdca7361d083638dc7f422fe8e1ae77860f6a6 (patch)
tree8d0846a5114a5a31517921dbba74acf44b129dea
parent2063945fdc3d4c0ac8f9319d942eda720d02aabe (diff)
downloadlinux-stable-b5cdca7361d083638dc7f422fe8e1ae77860f6a6.tar.gz
linux-stable-b5cdca7361d083638dc7f422fe8e1ae77860f6a6.tar.bz2
linux-stable-b5cdca7361d083638dc7f422fe8e1ae77860f6a6.zip
Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory
The files auto.conf and tristate.conf are mandatory for building modules.builtin files, therefore include them as such. Usually, the top-level Makefile ensures that those files exist but we want to make sure we get noticed if they are missing for whatever reason. Signed-off-by: Dirk Gouders <dirk@gouders.net> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--scripts/Makefile.modbuiltin4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 40867a41615b..a072a4267746 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -8,10 +8,10 @@ src := $(obj)
PHONY := __modbuiltin
__modbuiltin:
--include include/config/auto.conf
+include include/config/auto.conf
# tristate.conf sets tristate variables to uppercase 'Y' or 'M'
# That way, we get the list of built-in modules in obj-Y
--include include/config/tristate.conf
+include include/config/tristate.conf
include scripts/Kbuild.include