diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/nls/Makefile | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'fs/nls/Makefile')
| -rw-r--r-- | fs/nls/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nls/Makefile b/fs/nls/Makefile index a7ade138d684..f499dd7c3905 100644 --- a/fs/nls/Makefile +++ b/fs/nls/Makefile | |||
| @@ -36,11 +36,9 @@ obj-$(CONFIG_NLS_ISO8859_6) += nls_iso8859-6.o | |||
| 36 | obj-$(CONFIG_NLS_ISO8859_7) += nls_iso8859-7.o | 36 | obj-$(CONFIG_NLS_ISO8859_7) += nls_iso8859-7.o |
| 37 | obj-$(CONFIG_NLS_ISO8859_8) += nls_cp1255.o | 37 | obj-$(CONFIG_NLS_ISO8859_8) += nls_cp1255.o |
| 38 | obj-$(CONFIG_NLS_ISO8859_9) += nls_iso8859-9.o | 38 | obj-$(CONFIG_NLS_ISO8859_9) += nls_iso8859-9.o |
| 39 | obj-$(CONFIG_NLS_ISO8859_10) += nls_iso8859-10.o | ||
| 40 | obj-$(CONFIG_NLS_ISO8859_13) += nls_iso8859-13.o | 39 | obj-$(CONFIG_NLS_ISO8859_13) += nls_iso8859-13.o |
| 41 | obj-$(CONFIG_NLS_ISO8859_14) += nls_iso8859-14.o | 40 | obj-$(CONFIG_NLS_ISO8859_14) += nls_iso8859-14.o |
| 42 | obj-$(CONFIG_NLS_ISO8859_15) += nls_iso8859-15.o | 41 | obj-$(CONFIG_NLS_ISO8859_15) += nls_iso8859-15.o |
| 43 | obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o | 42 | obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o |
| 44 | obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o | 43 | obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o |
| 45 | obj-$(CONFIG_NLS_ABC) += nls_abc.o | ||
| 46 | obj-$(CONFIG_NLS_UTF8) += nls_utf8.o | 44 | obj-$(CONFIG_NLS_UTF8) += nls_utf8.o |