summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-06 13:21:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-06 13:21:57 -0700
commit15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch)
tree7fa2f81c33c9efcb1a1568385beead75c5892cfb /net/tipc
parent6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff)
parent11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff)
downloadlinux-3.10-15700770ef7c5d12e2f1659d2ddbeb3f658d9f37.tar.gz
linux-3.10-15700770ef7c5d12e2f1659d2ddbeb3f658d9f37.tar.bz2
linux-3.10-15700770ef7c5d12e2f1659d2ddbeb3f658d9f37.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits) kconfig: fix mconf segmentation fault kbuild: enable use of code from a different dir kconfig: error out if recursive dependencies are found kbuild: scripts/basic/fixdep segfault on pathological string-o-death kconfig: correct minor typo in Kconfig warning message. kconfig: fix path to modules.txt in Kconfig help usr/Kconfig: fix typo kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs' kbuild: be more explicit on missing .config file kbuild: clarify the creation of the LOCALVERSION_AUTO string. kbuild: propagate errors from find in scripts/gen_initramfs_list.sh kconfig: refer to qt3 if we cannot find qt libraries kbuild: handle compressed cpio initramfs-es kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text kbuild: remove stale comment in modpost.c kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE kbuild: fix make mrproper for Documentation/DocBook/man kbuild: remove kconfig binaries during make mrproper kconfig/menuconfig: do not hardcode '.config' kbuild: override build timestamp & version ...
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index 3891cc00087..f9e367d946e 100644
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -18,7 +18,7 @@ config TIPC
This protocol support is also available as a module ( = code which
can be inserted in and removed from the running kernel whenever you
want). The module will be called tipc. If you want to compile it
- as a module, say M here and read <file:Documentation/modules.txt>.
+ as a module, say M here and read <file:Documentation/kbuild/modules.txt>.
If in doubt, say N.