diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /fs/nls | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'fs/nls')
| -rw-r--r-- | fs/nls/nls_base.c | 2 | ||||
| -rw-r--r-- | fs/nls/nls_big5.c | 2 | ||||
| -rw-r--r-- | fs/nls/nls_euc-jp.c | 2 | ||||
| -rw-r--r-- | fs/nls/nls_euc-kr.c | 2 | ||||
| -rw-r--r-- | fs/nls/nls_gb2312.c | 2 | ||||
| -rw-r--r-- | fs/nls/nls_sjis.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 3ea51cdfa..e98d8490c 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -20,7 +20,7 @@ #endif #include <linux/spinlock.h> -static struct nls_table *tables = (struct nls_table *) NULL; +static struct nls_table *tables; static spinlock_t nls_lock = SPIN_LOCK_UNLOCKED; /* diff --git a/fs/nls/nls_big5.c b/fs/nls/nls_big5.c index 847904ba1..250098337 100644 --- a/fs/nls/nls_big5.c +++ b/fs/nls/nls_big5.c @@ -8,7 +8,7 @@ #include <linux/nls.h> #include <linux/errno.h> -static struct nls_table *p_nls = NULL; +static struct nls_table *p_nls; static struct nls_table table = { "big5", diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c index 98b380e59..196a07698 100644 --- a/fs/nls/nls_euc-jp.c +++ b/fs/nls/nls_euc-jp.c @@ -8,7 +8,7 @@ #include <linux/nls.h> #include <linux/errno.h> -static struct nls_table *p_nls = NULL; +static struct nls_table *p_nls; #define SS2 (0x8E) /* Single Shift 2 */ diff --git a/fs/nls/nls_euc-kr.c b/fs/nls/nls_euc-kr.c index 5219c2371..f015c21bf 100644 --- a/fs/nls/nls_euc-kr.c +++ b/fs/nls/nls_euc-kr.c @@ -8,7 +8,7 @@ #include <linux/nls.h> #include <linux/errno.h> -static struct nls_table *p_nls = NULL; +static struct nls_table *p_nls; static struct nls_table table = { "euc-kr", diff --git a/fs/nls/nls_gb2312.c b/fs/nls/nls_gb2312.c index 542a10e97..06c184a27 100644 --- a/fs/nls/nls_gb2312.c +++ b/fs/nls/nls_gb2312.c @@ -8,7 +8,7 @@ #include <linux/nls.h> #include <linux/errno.h> -static struct nls_table *p_nls = NULL; +static struct nls_table *p_nls; static struct nls_table table = { "gb2312", diff --git a/fs/nls/nls_sjis.c b/fs/nls/nls_sjis.c index ec6fb598f..463ee02a5 100644 --- a/fs/nls/nls_sjis.c +++ b/fs/nls/nls_sjis.c @@ -8,7 +8,7 @@ #include <linux/nls.h> #include <linux/errno.h> -static struct nls_table *p_nls = NULL; +static struct nls_table *p_nls; static struct nls_table table = { "sjis", |