--- ./linux-2.4.18-18mdk/fs/udf/super.c.NLS	Thu May 30 16:22:38 2002
+++ ./linux-2.4.18-18mdk/fs/udf/super.c	Sat Jul  6 16:09:32 2002
@@ -268,6 +268,11 @@
 			uopt->nls_map = load_nls(val);
 			uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
 		}
+#if defined(CONFIG_SUPERMOUNT) || defined(CONFIG_SUPERMOUNT_MODULE)
+		/* Silently ignore NLS option */
+		else if (!strcmp (opt, "codepage"))
+			/* Don't do anything ;-) */ ;
+#endif
 #endif
 		else if (!strcmp(opt, "utf8") && !val)
 			uopt->flags |= (1 << UDF_FLAG_UTF8);
--- ./linux-2.4.18-18mdk/fs/ext2/super.c.NLS	Mon Feb 25 22:38:08 2002
+++ ./linux-2.4.18-18mdk/fs/ext2/super.c	Sat Jul  6 13:39:28 2002
@@ -274,6 +274,12 @@
 		         || !strcmp (this_char, "quota")
 		         || !strcmp (this_char, "usrquota"))
 			/* Don't do anything ;-) */ ;
+#if defined(CONFIG_SUPERMOUNT) || defined(CONFIG_SUPERMOUNT_MODULE)
+		/* Silently ignore NLS options */
+		else if (!strcmp (this_char, "iocharset")
+		         || !strcmp (this_char, "codepage"))
+			/* Don't do anything ;-) */ ;
+#endif
 		else {
 			printk ("EXT2-fs: Unrecognized mount option %s\n", this_char);
 			return 0;