config: enable pcie endpoint
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 12
− 1
@@ -2022,9 +2022,12 @@ CONFIG_PCI_HOST_GENERIC=y
@@ -2037,8 +2040,10 @@ CONFIG_PCIE_DW_HOST=y
@@ -2057,6 +2062,12 @@ CONFIG_PCI_KEYSTONE_HOST=y
@@ -2471,7 +2482,7 @@ CONFIG_DS1682=m