diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 16:20:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 16:27:16 +1000 |
| commit | 86254706b3f7807212c407d3b7683e5439ca7ad6 (patch) | |
| tree | 0506ef878b4380876f1e79dc18dd076190a0ea6c /init | |
| parent | d2231487f88b8c709cefd8aaaefbe64178c984de (diff) | |
| parent | 09650e3ed3d36e80eda486f8717a44e678fe150b (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/char/hvc_console.h
kernel/stop_machine.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 6199d1120900..c8578f9ee31d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -856,8 +856,8 @@ config MODULE_UNLOAD help Without this option you will not be able to unload any modules (note that some modules may not be unloadable - anyway), which makes your kernel slightly smaller and - simpler. If unsure, say Y. + anyway), which makes your kernel smaller, faster + and simpler. If unsure, say Y. config MODULE_FORCE_UNLOAD bool "Forced module unloading" |