From 63355962d8446bea6facfd554e397fa55eefe412 Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Wed, 22 Apr 2020 16:15:35 +0000
Subject: [PATCH] Revert "ANDROID: gki_defconfig: Drop CONFIG_PCIEPORTBUS"

This reverts commit c6ca683891186b9679b900e617807c74ca5589e2.

Reason for revert: restore pcieportbus for 5.4 dev

Bug: 153142844
Bug: 154539208
Change-Id: I0e0aaa45c74627292ca5a7e0ccf57e52edf48953
Signed-off-by: Alistair Delva <adelva@google.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
---
 arch/arm64/configs/gki_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 257329c406be..5ba542412193 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -213,6 +213,8 @@ CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIEAER is not set
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_KIRIN=y