summaryrefslogtreecommitdiff
path: root/configs/cardhu_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'configs/cardhu_defconfig')
-rw-r--r--configs/cardhu_defconfig3
1 files changed, 0 insertions, 3 deletions
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