diff options
Diffstat (limited to 'configs/trimslice_defconfig')
| -rw-r--r-- | configs/trimslice_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
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 |
