dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig

[oweals/u-boot.git] / configs / jetson-tk1_defconfig

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index cb9c98a9589e8f2987e9a46dd5307d9ddf5c6a5f..9500d2cff6469ef644ecc556e714736a07e02113 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,6 +13,11 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
+CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y