From fde7e18938d84950979beccb4b2b279efb19c4bd Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 19 Nov 2015 20:26:55 -0700
Subject: 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 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'configs/jetson-tk1_defconfig')

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 8bc3015c44..9500d2cff6 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,7 +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
-- 
cgit v1.2.1