diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-01 20:13:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-01 20:13:24 +0100 |
| commit | 630c12862c21a312c15a494922cdbf9c1beb1733 (patch) | |
| tree | 03e5eb9f3c4bbca07ce64f76039d35577f52639c /fs/Makefile | |
| parent | Merge tag 'audit-pr-20220131' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | unicode: clean up the Kconfig symbol confusion (diff) | |
| download | linux-630c12862c21a312c15a494922cdbf9c1beb1733.tar.xz linux-630c12862c21a312c15a494922cdbf9c1beb1733.zip | |
Merge tag 'unicode-for-next-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode
Pull unicode cleanup from Gabriel Krisman Bertazi:
"A fix from Christoph Hellwig merging the CONFIG_UNICODE_UTF8_DATA into
the previous CONFIG_UNICODE. It is -rc material since we don't want to
expose the former symbol on 5.17.
This has been living on linux-next for the past week"
* tag 'unicode-for-next-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode:
unicode: clean up the Kconfig symbol confusion
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index dab324aea08f..208a74e0b00e 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -96,7 +96,7 @@ obj-$(CONFIG_EXPORTFS) += exportfs/ obj-$(CONFIG_NFSD) += nfsd/ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ -obj-$(CONFIG_UNICODE) += unicode/ +obj-y += unicode/ obj-$(CONFIG_SYSV_FS) += sysv/ obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ obj-$(CONFIG_CIFS) += cifs/ |