summaryrefslogtreecommitdiffstats
path: root/fs/nls/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
commit86464aed71025541805e7b1515541aee89879e33 (patch)
treee01a457a4912a8553bc65524aa3125d51f29f810 /fs/nls/Makefile
parent88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff)
Merge with Linux 2.2.1.
Diffstat (limited to 'fs/nls/Makefile')
-rw-r--r--fs/nls/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nls/Makefile b/fs/nls/Makefile
index 4f51a5f9d..879fef8ff 100644
--- a/fs/nls/Makefile
+++ b/fs/nls/Makefile
@@ -286,6 +286,14 @@ else
endif
endif
+ifeq ($(CONFIG_NLS_ISO8859_15),y)
+NLS += nls_iso8859-15.o
+else
+ ifeq ($(CONFIG_NLS_ISO8859_15),m)
+ M_OBJS += nls_iso8859-15.o
+ endif
+endif
+
ifeq ($(CONFIG_NLS_KOI8_R),y)
NLS += nls_koi8-r.o
else