From 7705bdfcd746b8465fec8b3375cba78827884d22 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 4 Dec 2015 08:58:37 -0700 Subject: 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 Reported-by: Stephen Warren Tested-by: Stephen Warren Reported-by: Kevin Hilman Acked-by: Thomas Chou --- configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- configs/jetson-tk1_defconfig | 3 --- configs/trimslice_defconfig | 3 --- 4 files changed, 12 deletions(-) (limited to 'configs') diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 29303441d9..8add08d76d 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 5760018d68..c9f565a4f5 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 9500d2cff6..efc4aeeb32 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 ee40218d1c..e34faa3cfd 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 -- cgit v1.2.1