Commit 7705bdfc authored by Simon Glass's avatar Simon Glass Committed by Tom Rini

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: fde7e189 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Reported-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Reported-by: default avatarKevin Hilman <khilman@linaro.org>
Acked-by: default avatarThomas Chou <thomas@wytron.com.tw>
parent af7c03ea
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment