diff options
| author | Simon Glass <sjg@chromium.org> | 2015-12-04 15:58:37 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-05 23:22:37 (GMT) |
| commit | 7705bdfcd746b8465fec8b3375cba78827884d22 (patch) | |
| tree | 6732eaaa1510b73e9f8996f0f93bafddbe70c5ba /configs/jetson-tk1_defconfig | |
| parent | af7c03ea883efb939ab93b360639098569574626 (diff) | |
| download | u-boot-7705bdfcd746b8465fec8b3375cba78827884d22.tar.xz | |
tegra: Remove merge markers in some Kconfig files
These were added by mistake in commit fde7e189. They cause a warning when
configuring the boards. Remove them.
Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Reported-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Diffstat (limited to 'configs/jetson-tk1_defconfig')
| -rw-r--r-- | configs/jetson-tk1_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 9500d2c..efc4aee 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -13,11 +13,8 @@ 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 |