diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-07-24 15:44:47 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-07-24 15:44:47 +0200 |
| commit | 61b7369483efb5e0a9f3b48e75fac00d46d661e0 (patch) | |
| tree | 6a97cc6f8857f0d26dcd48627aa6f31b9875b07e /arch/sparc/configs/sparc64_defconfig | |
| parent | c3f698d85ecaf66d42871865b38c976c128c297c (diff) | |
| parent | 6c7f27441d6af776a89147027c6f4a11c0162c64 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get v6.5-rc2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'arch/sparc/configs/sparc64_defconfig')
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index 18099099583e..0bb0d4da5227 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -6,7 +6,6 @@ CONFIG_LOG_BUF_SHIFT=18 CONFIG_BLK_DEV_INITRD=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=y |