[PATCH] arm64: defconfig: Drop non-existing (yet) PCI_SKY1_HOST
Krzysztof Kozlowski <[email protected]>
| Newsgroups | dev.linux.lists.soc,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
The source patch for commit f54f7979ff88 ("arm64: defconfig: Move
entries to match savedefconfig") included reorganizing around
PCI_SKY1_HOST, which is only in next at that time and was not merged to
soc tree. Applying that patch caused some conflicts which were not
really resolved correctly and PCI_SKY1_HOST was added.
Cc: Peter Chen <[email protected]>
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
This should go to soc/defconfig branch.
The PCI_SKY1_HOST will come later with:
https://lore.kernel.org/all/[email protected]/
---
arch/arm64/configs/defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 094bb9cd8764..4ed684efbbba 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -232,7 +232,6 @@ CONFIG_PCIE_XILINX=y
CONFIG_PCIE_XILINX_DMA_PL=y
CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX_CPM=y
-CONFIG_PCI_SKY1_HOST=m
CONFIG_PCI_J721E_HOST=m
CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_LAYERSCAPE=y
--
2.53.0