X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configs%2Fcardhu_defconfig;h=5760018d68e7489cca947b8951576343ee045aa8;hb=a85670e40da1ef4f299effb73c36e48d39d50106;hp=65587e3fb04673cf24f94ad391ec7585fe86ea78;hpb=68d534201733e84257e357f7ddcb379dbe1cc5d0;p=platform%2Fkernel%2Fu-boot.git

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 65587e3..5760018 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -13,7 +13,11 @@ 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