summaryrefslogtreecommitdiff
path: root/arch/m68k/configs/apollo_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-11-21 20:50:18 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2024-11-21 20:50:18 +0300
commitc01f664e4ca210823b7594b50669bbd9b0a3c3b0 (patch)
treea628328f90d9696b55606a89758c1d41ffaa9609 /arch/m68k/configs/apollo_defconfig
parent597861d6cd343a6ded4cf0302f6fc25ec548e1cc (diff)
parentfb6f20ecb121cef4d7946f834a6ee867c4e21b4a (diff)
downloadlinux-c01f664e4ca210823b7594b50669bbd9b0a3c3b0.tar.xz
Merge tag 'reiserfs_delete' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs removal from Jan Kara: "The deprecation period of reiserfs is ending at the end of this year so it is time to remove it" * tag 'reiserfs_delete' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: reiserfs: The last commit
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
-rw-r--r--arch/m68k/configs/apollo_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 312853f3d26a..6d62b9187a58 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -406,7 +406,6 @@ CONFIG_RTC_DRV_GENERIC=m
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m
CONFIG_EXT4_FS=y
-CONFIG_REISERFS_FS=m
CONFIG_JFS_FS=m
CONFIG_OCFS2_FS=m
# CONFIG_OCFS2_DEBUG_MASKLOG is not set