Merge branch 'linus' into sched/core, to resolve conflicts

[linux-2.6-block.git] / fs / nls / nls_euc-jp.c

diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
index 7424929a278b0088ba92772ffb1b3a7644864906..162b3f160353c6ab076644079c861a2b4f1fd736 100644 (file)
--- a/fs/nls/nls_euc-jp.c
+++ b/fs/nls/nls_euc-jp.c
@@ -553,7 +553,6 @@ static struct nls_table table = {
        .charset        = "euc-jp",
        .uni2char       = uni2char,
        .char2uni       = char2uni,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_euc_jp(void)