[U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files

Simon Glass
2015-12-04T15:58:37Z

These were added by mistake in commit fde7e189. They cause a warning when
configuring the boards. Remove them.

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

configs/beaver_defconfig | 3 ---
configs/cardhu_defconfig | 3 ---
configs/jetson-tk1_defconfig | 3 ---
configs/trimslice_defconfig | 3 ---
4 files changed, 12 deletions(-)

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 2930344..8add08d 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_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_TEGRA20_SLINK=y
CONFIG_USB=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 5760018..c9f565a 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_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_TEGRA20_SLINK=y
CONFIG_USB=y
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
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index ee40218..e34faa3 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_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_TEGRA20_SFLASH=y
CONFIG_USB=y
--
2.6.0.rc2.230.g3dd15c0