path: root/Documentation/kbuild
diff options
authorLinus Torvalds <>2020-12-22 14:04:25 -0800
committerLinus Torvalds <>2020-12-22 14:04:25 -0800
commit2762db756f422861c70868bc2d4b9b5d1ce6a59d (patch)
tree7e72d255ef8b4e8d4a68cb187693dc0fa194943e /Documentation/kbuild
parent7b95f0563ab5a8f75195cdd4b2c3325c0c1df319 (diff)
parent90d39628ac799e93c0f7a56763eed5029632f1ba (diff)
Merge tag 'kconfig-v5.11' of git://
Pull Kconfig updates from Masahiro Yamada: - Support only Qt5 for qconf - Validate signal/slot connection at compile time of qconf - Sanitize header includes * tag 'kconfig-v5.11' of git:// kconfig: doc: fix $(fileno) to $(filename) kconfig: fix return value of do_error_if() kconfig: clean up header inclusion kconfig: qconf: show Qt version in the About dialog kconfig: make lkc.h self-sufficient #include-wise kconfig: qconf: convert to Qt5 new signal/slot connection syntax kconfig: qconf: use a variable to pass packages to pkg-config kconfig: qconf: drop Qt4 support
Diffstat (limited to 'Documentation/kbuild')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kbuild/kconfig-macro-language.rst b/Documentation/kbuild/kconfig-macro-language.rst
index 8b413ef9603d..6163467f6ae4 100644
--- a/Documentation/kbuild/kconfig-macro-language.rst
+++ b/Documentation/kbuild/kconfig-macro-language.rst
@@ -97,7 +97,7 @@ Like Make, Kconfig provides several built-in functions. Every function takes a
particular number of arguments.
In Make, every built-in function takes at least one argument. Kconfig allows
-zero argument for built-in functions, such as $(fileno), $(lineno). You could
+zero argument for built-in functions, such as $(filename), $(lineno). You could
consider those as "built-in variable", but it is just a matter of how we call
it after all. Let's say "built-in function" here to refer to natively supported