kbuild: Revert part of e8d400a to resolve a conflict
authorMichal Marek <mmarek@suse.cz>
Thu, 27 May 2010 14:07:37 +0000 (16:07 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 27 May 2010 14:07:37 +0000 (16:07 +0200)
A more complete patch in the kernel-doc tree also contains this change.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Documentation/kbuild/makefiles.txt

index 0135155..71c602d 100644 (file)
@@ -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.