aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/kmod.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:38:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:38:34 -0400
commitc8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch)
treeedfd028285e21ba549d047c0caa4ffe523272f94 /kernel/kmod.c
parente4856a70cfc23266631a78e78277cf2b195babee (diff)
parent118a9069f06ff591d51a3133e242f0c256ba2db7 (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: module: remove CONFIG_KMOD in comment after #endif remove CONFIG_KMOD from fs remove CONFIG_KMOD from drivers Manually fix conflict due to include cleanups in drivers/md/md.c
Diffstat (limited to 'kernel/kmod.c')
-rw-r--r--kernel/kmod.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c
index ab7dd08472f..3d3c3ea3a02 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -113,7 +113,7 @@ int request_module(const char *fmt, ...)
113 return ret; 113 return ret;
114} 114}
115EXPORT_SYMBOL(request_module); 115EXPORT_SYMBOL(request_module);
116#endif /* CONFIG_KMOD */ 116#endif /* CONFIG_MODULES */
117 117
118struct subprocess_info { 118struct subprocess_info {
119 struct work_struct work; 119 struct work_struct work;