diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
| commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
| tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /init | |
| parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
| parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4ad6de163238..e63a017c391e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -143,9 +143,7 @@ config POSIX_MQUEUE | |||
| 143 | queues every message has a priority which decides about succession | 143 | queues every message has a priority which decides about succession |
| 144 | of receiving it by a process. If you want to compile and run | 144 | of receiving it by a process. If you want to compile and run |
| 145 | programs written e.g. for Solaris with use of its POSIX message | 145 | programs written e.g. for Solaris with use of its POSIX message |
| 146 | queues (functions mq_*) say Y here. To use this feature you will | 146 | queues (functions mq_*) say Y here. |
| 147 | also need mqueue library, available from | ||
| 148 | <http://www.mat.uni.torun.pl/~wrona/posix_ipc/> | ||
| 149 | 147 | ||
| 150 | POSIX message queues are visible as a filesystem called 'mqueue' | 148 | POSIX message queues are visible as a filesystem called 'mqueue' |
| 151 | and can be mounted somewhere if you want to do filesystem | 149 | and can be mounted somewhere if you want to do filesystem |
| @@ -308,7 +306,7 @@ config SYSFS_DEPRECATED | |||
| 308 | releases. | 306 | releases. |
| 309 | 307 | ||
| 310 | If enabled, this option will also move any device structures | 308 | If enabled, this option will also move any device structures |
| 311 | that belong to a class, back into the /sys/class heirachy, in | 309 | that belong to a class, back into the /sys/class hierarchy, in |
| 312 | order to support older versions of udev. | 310 | order to support older versions of udev. |
| 313 | 311 | ||
| 314 | If you are using a distro that was released in 2006 or later, | 312 | If you are using a distro that was released in 2006 or later, |