diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-05-27 16:07:37 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-05-27 16:07:37 +0200 |
| commit | 64ffc9ff424c65adcffe7d590018cc75e2d5d42a (patch) | |
| tree | 45b9c2df54046d64c5af86d3b88419eb7c481568 | |
| parent | fb994ecc2b1c214951366c2ba5d8b121f0010d1f (diff) | |
| download | kernel_samsung_smdk4412-64ffc9ff424c65adcffe7d590018cc75e2d5d42a.zip kernel_samsung_smdk4412-64ffc9ff424c65adcffe7d590018cc75e2d5d42a.tar.gz kernel_samsung_smdk4412-64ffc9ff424c65adcffe7d590018cc75e2d5d42a.tar.bz2 | |
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 <sfr@canb.auug.org.au>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 0135155..71c602d 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. |