diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
| commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
| tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /fs/nls/nls_base.c | |
| parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) | |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'fs/nls/nls_base.c')
| -rw-r--r-- | fs/nls/nls_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 33e6dfd26..afc219838 100644 --- a/fs/nls/nls_base.c +++ b/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 *find_nls(char *charset) 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 @@ struct nls_table *load_nls(char *charset) return nls; } -#ifndef CONFIG_KERNELD +#ifndef CONFIG_KMOD return NULL; #else if (strlen(charset) > sizeof(buf) - sizeof("nls_")) { |