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

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index edb90b58a9b1..9a06dc93ee0d 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);