commit fde7e18938d84950979beccb4b2b279efb19c4bd
author Simon Glass <sjg@chromium.org> Thu Nov 19 20:26:55 2015 -0700
committer Simon Glass <sjg@chromium.org> Tue Dec 01 06:26:36 2015 -0700
tree cbe749b405bf36864844704e92ef0d635f7bdfa4
parent 15bcc62d5382579a65f1c6375fd964301437601c

dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig

Move this option to Kconfig and fix up all users.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>

configs/jetson-tk1_defconfig

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 8bc3015..9500d2c 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,7 +13,11 @@
 # 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