diff options
Diffstat (limited to 'configs/beaver_defconfig')
| -rw-r--r-- | configs/beaver_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index dcc9cc3..2930344 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_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 |