From: Michal Marek Date: Thu, 27 May 2010 14:07:37 +0000 (+0200) Subject: kbuild: Revert part of e8d400a to resolve a conflict X-Git-Tag: v2.6.35-rc2~61^2 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=64ffc9ff424c65adcffe7d590018cc75e2d5d42a;p=net-next-2.6.git kbuild: Revert part of e8d400a to resolve a conflict A more complete patch in the kernel-doc tree also contains this change. Reported-by: Stephen Rothwell Signed-off-by: Michal Marek --- diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 01351554df6..71c602d6168 100644 --- 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.