Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / fs / nls / nls_base.c

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index a912debcd20b3c27850c4e5754e164888a0a9e9d..b1317ad5ca1851f0ba4954d7bb47bba1bd239213 100644 (file)
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/config.h>
 #include <linux/nls.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -164,8 +163,6 @@ int register_nls(struct nls_table * nls)
 {
        struct nls_table ** tmp = &tables;
 
-       if (!nls)
-               return -EINVAL;
        if (nls->next)
                return -EBUSY;