From 3b9aa206619085aa5248dc4cc3505656ed6a01e0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 14 Apr 2022 07:43:23 +0200 Subject: [PATCH] ANDROID: gki_defconfig: remove CONFIG_ND_BLK It was not used, and was removed in commit f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver") so remove it from the gki_defconfig files so the build works properly. Fixes: f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver") Signed-off-by: Greg Kroah-Hartman Change-Id: Ifedc35a228240bd042000cf1808b084fdb0a6c4b --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index acd165cf474b..fc275907c665 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -544,7 +544,6 @@ CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_VENDOR_HOOKS=y CONFIG_ANDROID_DEBUG_KINFO=y CONFIG_LIBNVDIMM=y -# CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2bd73fe7bf5a..18263269120c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -483,7 +483,6 @@ CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_VENDOR_HOOKS=y CONFIG_ANDROID_DEBUG_KINFO=y CONFIG_LIBNVDIMM=y -# CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y