Merge initializer conflict manually
[linux-2.6/history.git] / fs / nls / nls_tis-620.c
blob4fcea5e4dd36bd9799f76d5de18b9dbdd7cfd346
1 /*
2 * linux/fs/nls_tis-620.c
3 */
5 #include <linux/module.h>
6 #include <linux/kernel.h>
7 #include <linux/string.h>
8 #include <linux/nls.h>
9 #include <linux/errno.h>
11 static struct nls_table *p_nls;
13 static struct nls_table table = {
14 .charset = "tis-620",
15 .owner = THIS_MODULE,
18 static int __init init_nls_tis_620(void)
20 p_nls = load_nls("cp874");
22 if (p_nls) {
23 table.uni2char = p_nls->uni2char;
24 table.char2uni = p_nls->char2uni;
25 table.charset2upper = p_nls->charset2upper;
26 table.charset2lower = p_nls->charset2lower;
27 return register_nls(&table);
30 return -EINVAL;
33 static void __exit exit_nls_tis_620(void)
35 unregister_nls(&table);
36 unload_nls(p_nls);
39 module_init(init_nls_tis_620)
40 module_exit(exit_nls_tis_620)
41 MODULE_LICENSE("Dual BSD/GPL");
44 * Overrides for Emacs so that we follow Linus's tabbing style.
45 * Emacs will notice this stuff at the end of the file and automatically
46 * adjust the settings for this buffer only. This must remain at the end
47 * of the file.
49 ---------------------------------------------------------------------------
50 * Local variables:
51 * c-indent-level: 8
52 * c-brace-imaginary-offset: 0
53 * c-brace-offset: -8
54 * c-argdecl-indent: 8
55 * c-label-offset: -8
56 * c-continued-statement-offset: 8
57 * c-continued-brace-offset: 0
58 * End: