patch-2.1.90 linux/fs/nls/nls_base.c
Next file: linux/fs/ntfs/fs.c
Previous file: linux/fs/nfs/nfs2xdr.c
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Tue Mar 10 14:43:13 1998
- Orig file:
v2.1.89/linux/fs/nls/nls_base.c
- Orig date:
Sun Dec 21 17:41:24 1997
diff -u --recursive --new-file v2.1.89/linux/fs/nls/nls_base.c linux/fs/nls/nls_base.c
@@ -12,8 +12,8 @@
#include <linux/config.h>
#include <linux/nls.h>
#include <linux/malloc.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#endif
#include <asm/byteorder.h>
@@ -205,7 +205,7 @@
struct nls_table *load_nls(char *charset)
{
struct nls_table *nls;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
char buf[40];
int ret;
#endif
@@ -216,7 +216,7 @@
return nls;
}
-#ifndef CONFIG_KERNELD
+#ifndef CONFIG_KMOD
return NULL;
#else
if (strlen(charset) > sizeof(buf) - sizeof("nls_")) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov