diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:03:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:03:39 -0800 |
| commit | 0bbb2753584231db364b624bf8cf82551b94da7d (patch) | |
| tree | 559c49330037fa4e2f5d231e06576f80dc49caaf /init | |
| parent | 0578c3b4d44c34e499e1fd5916ed6c63635b25cf (diff) | |
| parent | 9e01892c4234070bbcf3a9f582514c8b91464375 (diff) | |
| download | blackbird-op-linux-0bbb2753584231db364b624bf8cf82551b94da7d.tar.gz blackbird-op-linux-0bbb2753584231db364b624bf8cf82551b94da7d.zip | |
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:
module: convert to stop_machine_create/destroy.
stop_machine: introduce stop_machine_create/destroy.
parisc: fix module loading failure of large kernel modules
module: fix module loading failure of large kernel modules for parisc
module: fix warning of unused function when !CONFIG_PROC_FS
kernel/module.c: compare symbol values when marking symbols as exported in /proc/kallsyms.
remove CONFIG_KMOD
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig index f6281711166d..52847eec7398 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -916,12 +916,6 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. -config KMOD - def_bool y - help - This is being removed soon. These days, CONFIG_MODULES - implies CONFIG_KMOD, so use that instead. - endif # MODULES config INIT_ALL_POSSIBLE |
