Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.git] / drivers / mtd / mtdpart.c

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index edb90b58a9b16980bd42066f6026bbd1ca7c0667..9a06dc93ee0d36a14428b618d810fb2ece02140d 100644 (file)
--- 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);