diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 13:19:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 13:19:49 -0400 |
commit | ad5cf46b4e3b29f2bc08543e8ef0bf8b13d3f19e (patch) | |
tree | 302266c69730de99546f1f5020e9fe134a0b47bf /scripts/basic/docproc.c | |
parent | 93db6294958f62643a917e44d1abc85440e600cf (diff) | |
parent | e34e7dbb35474ffc75f639eca64a18a15f4f8688 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kernel-doc: fix param matching for array params
kernel-doc: ignore kmemcheck_bitfield_begin/end
kallsyms: fix inverted valid symbol checking
kbuild: fix build error during make htmldocs
Diffstat (limited to 'scripts/basic/docproc.c')
-rw-r--r-- | scripts/basic/docproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index 4c9523ef9c0..99ca7a69868 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c | |||
@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) | |||
385 | if (!srctree) | 385 | if (!srctree) |
386 | srctree = getcwd(NULL, 0); | 386 | srctree = getcwd(NULL, 0); |
387 | kernsrctree = getenv("KBUILD_SRC"); | 387 | kernsrctree = getenv("KBUILD_SRC"); |
388 | if (!kernsrctree) | 388 | if (!kernsrctree || !*kernsrctree) |
389 | kernsrctree = srctree; | 389 | kernsrctree = srctree; |
390 | if (argc != 3) { | 390 | if (argc != 3) { |
391 | usage(); | 391 | usage(); |