From f5e944d29fb0e1fb4488fd7ba5cfeaff67762557 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 12 Apr 2022 13:41:40 +0200 Subject: [PATCH] ANDROID: arm64 gki_defconfig fixup Commit 1d38fe6ee6a8 ("PCI/VGA: Move vgaarb to drivers/pci")caused the CONFIG_VGA_ARB configuration option to move places, which broke the build. Move it to the correct location so that TreeHugger tests knows that all is still good. Fixes: 1d38fe6ee6a8 ("PCI/VGA: Move vgaarb to drivers/pci") Signed-off-by: Greg Kroah-Hartman Change-Id: I91be80867c80b67f5b428ab8c843e9618a54fbfb --- arch/arm64/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 76c62431658a..db3a11ec34fd 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -278,6 +278,7 @@ CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y CONFIG_PCI_IOV=y +# CONFIG_VGA_ARB is not set CONFIG_PCI_HOST_GENERIC=y CONFIG_PCIE_DW_PLAT_EP=y CONFIG_PCIE_QCOM=y @@ -433,7 +434,6 @@ CONFIG_USB_GSPCA=y CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y -# CONFIG_VGA_ARB is not set CONFIG_DRM=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y