diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:38:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:38:34 -0400 |
commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
tree | edfd028285e21ba549d047c0caa4ffe523272f94 /fs/char_dev.c | |
parent | e4856a70cfc23266631a78e78277cf2b195babee (diff) | |
parent | 118a9069f06ff591d51a3133e242f0c256ba2db7 (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 'fs/char_dev.c')
-rw-r--r-- | fs/char_dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 3cb7cda3d780..262fa10e213d 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
@@ -22,9 +22,6 @@ | |||
22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
23 | #include <linux/backing-dev.h> | 23 | #include <linux/backing-dev.h> |
24 | 24 | ||
25 | #ifdef CONFIG_KMOD | ||
26 | #include <linux/kmod.h> | ||
27 | #endif | ||
28 | #include "internal.h" | 25 | #include "internal.h" |
29 | 26 | ||
30 | /* | 27 | /* |