diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 13:17:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 13:17:15 -0700 |
| commit | 6eaaaac97433575894570a990aa27310040a8177 (patch) | |
| tree | 0d61224358c40309096a0c026ad0d1c7120fa0d6 /kernel/kmod.c | |
| parent | 06b8147c5dbd385b5b97ca74e19f6f3951ebc1cb (diff) | |
| parent | a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
remove CONFIG_KMOD from core kernel code
remove CONFIG_KMOD from lib
remove CONFIG_KMOD from sparc64
rework try_then_request_module to do less in non-modular kernels
remove mention of CONFIG_KMOD from documentation
make CONFIG_KMOD invisible
modules: Take a shortcut for checking if an address is in a module
module: turn longs into ints for module sizes
Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs
module: reorder struct module to save space on 64 bit builds
module: generic each_symbol iterator function
module: don't use stop_machine for waiting rmmod
Diffstat (limited to 'kernel/kmod.c')
| -rw-r--r-- | kernel/kmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 8df97d3dfda..90d7af1c165 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -42,7 +42,7 @@ extern int max_threads; static struct workqueue_struct *khelper_wq; -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES /* modprobe_path is set via /proc/sys. |