summaryrefslogtreecommitdiff
path: root/arch/m68k/configs/amiga_defconfig
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2023-11-15 12:45:19 +0300
committerMaxime Ripard <mripard@kernel.org>2023-11-15 12:56:44 +0300
commit3bf3e21c15d4386a5f15118ec39bbc1b67ea5759 (patch)
treea8880bb7b152d913ebd86e7cd858600dbe22ed38 /arch/m68k/configs/amiga_defconfig
parent34b98a5f7a185c19715cc98c57d7e27b4785dfdf (diff)
parentb85ea95d086471afb4ad062012a4d73cd328fa86 (diff)
downloadlinux-3bf3e21c15d4386a5f15118ec39bbc1b67ea5759.tar.xz
Merge drm/drm-next into drm-misc-next
Let's kickstart the v6.8 release cycle. Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'arch/m68k/configs/amiga_defconfig')
-rw-r--r--arch/m68k/configs/amiga_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 6deb8faa564b..7e6b74b6eecd 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -299,6 +299,7 @@ CONFIG_NET_IFE=m
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_DM_KUNIT_TEST=m
CONFIG_CONNECTOR=m
CONFIG_PARPORT=m
CONFIG_PARPORT_AMIGA=m