Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...

[linux-2.6-microblaze.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a2ec60f..830c196 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4963,11 +4963,6 @@ no_journal:
                goto failed_mount4;
        }
 
-#ifdef CONFIG_UNICODE
-       if (sb->s_encoding)
-               sb->s_d_op = &ext4_dentry_ops;
-#endif
-
        sb->s_root = d_make_root(root);
        if (!sb->s_root) {
                ext4_msg(sb, KERN_ERR, "get root dentry failed");