kbuild: Revert part of e8d400a to resolve a conflict

[firefly-linux-kernel-4.4.55.git] / Documentation / kbuild / makefiles.txt

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 01351554df60eb88e1589eacabd988ad20ca74e4..71c602d61680d422694a81c08b0cd4f802e18e7c 100644 (file)
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -320,7 +320,7 @@ more details, with real examples.
     subdir-ccflags-y, subdir-asflags-y
        The two flags listed above are similar to ccflags-y and as-falgs-y.
        The difference is that the subdir- variants has effect for the kbuild
-       file where they are present and all subdirectories.
+       file where tey are present and all subdirectories.
        Options specified using subdir-* are added to the commandline before
        the options specified using the non-subdir variants.