From 7799e73232936402653bfa08e6c887302e72c9e5 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 12 Aug 2020 11:56:28 -0700 Subject: [PATCH] ANDROID: Fix bad revert of VIRTIO_PCI_LEGACY in rockpi4_defconfig rockpi4_defconfig got updated by commit 64b9a2067308 ("ANDROID: Remove default y for VIRTIO_PCI_LEGACY"), but then the revert commit 62f596614adc ("ANDROID: Re-add default y for VIRTIO_PCI_LEGACY") forgot to undo the change to rockpi4_defconfig. Do it now. Fixes: 62f596614adc ("ANDROID: Re-add default y for VIRTIO_PCI_LEGACY") Change-Id: I32340f8eff6471bc6223edfbcb4071f6a235b431 Signed-off-by: Eric Biggers --- arch/arm64/configs/rockpi4_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/rockpi4_defconfig b/arch/arm64/configs/rockpi4_defconfig index 08ac7fad8111..d4845d044a9f 100644 --- a/arch/arm64/configs/rockpi4_defconfig +++ b/arch/arm64/configs/rockpi4_defconfig @@ -454,6 +454,7 @@ CONFIG_RTC_DRV_PL031=y CONFIG_DMADEVICES=y CONFIG_PL330_DMA=y CONFIG_VIRTIO_PCI=y +# CONFIG_VIRTIO_PCI_LEGACY is not set CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y