diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 /drivers/mtd | |
| 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 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index edb90b58a9b..9a06dc93ee0 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -564,10 +564,8 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types, for ( ; ret <= 0 && *types; types++) { parser = get_partition_parser(*types); -#ifdef CONFIG_KMOD if (!parser && !request_module("%s", *types)) parser = get_partition_parser(*types); -#endif if (!parser) { printk(KERN_NOTICE "%s partition parsing not available\n", *types); |