Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / fs / nls / Makefile

diff --git a/fs/nls/Makefile b/fs/nls/Makefile
index a7ade138d684eddf54efcfa907e0e0c94eba60e7..f499dd7c3905bfcee723ab86bf231b13dc27300a 100644 (file)
--- a/fs/nls/Makefile
+++ b/fs/nls/Makefile
@@ -36,11 +36,9 @@ obj-$(CONFIG_NLS_ISO8859_6)  += nls_iso8859-6.o
 obj-$(CONFIG_NLS_ISO8859_7)    += nls_iso8859-7.o
 obj-$(CONFIG_NLS_ISO8859_8)    += nls_cp1255.o
 obj-$(CONFIG_NLS_ISO8859_9)    += nls_iso8859-9.o
-obj-$(CONFIG_NLS_ISO8859_10)   += nls_iso8859-10.o
 obj-$(CONFIG_NLS_ISO8859_13)   += nls_iso8859-13.o
 obj-$(CONFIG_NLS_ISO8859_14)   += nls_iso8859-14.o
 obj-$(CONFIG_NLS_ISO8859_15)   += nls_iso8859-15.o
 obj-$(CONFIG_NLS_KOI8_R)       += nls_koi8-r.o
 obj-$(CONFIG_NLS_KOI8_U)       += nls_koi8-u.o nls_koi8-ru.o
-obj-$(CONFIG_NLS_ABC)          += nls_abc.o
 obj-$(CONFIG_NLS_UTF8)         += nls_utf8.o