Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h

1 files changed, 1 insertions, 20 deletions

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index 64965e1c21c4..9b0efdad8910 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -13,9 +13,7 @@
 #include <linux/nls.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/spinlock.h>
 
 static struct nls_table default_table;
@@ -215,24 +213,7 @@ static struct nls_table *find_nls(char *charset)
 
 struct nls_table *load_nls(char *charset)
 {
-        struct nls_table *nls;
-#ifdef CONFIG_KMOD
-        int ret;
-#endif
-
-        nls = find_nls(charset);
-        if (nls)
-                return nls;
-
-#ifdef CONFIG_KMOD
-        ret = request_module("nls_%s", charset);
-        if (ret != 0) {
-                printk("Unable to load NLS charset %s\n", charset);
-                return NULL;
-        }
-        nls = find_nls(charset);
-#endif
-        return nls;
+        return try_then_request_module(find_nls(charset), "nls_%s", charset);
 }
 
 void unload_nls(struct nls_table *nls)