diff options
| author | Simon Glass <sjg@chromium.org> | 2015-11-19 20:26:55 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-01 06:26:36 -0700 |
| commit | fde7e18938d84950979beccb4b2b279efb19c4bd (patch) | |
| tree | cbe749b405bf36864844704e92ef0d635f7bdfa4 /configs/trimslice_defconfig | |
| parent | 15bcc62d5382579a65f1c6375fd964301437601c (diff) | |
dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
Move this option to Kconfig and fix up all users.
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'configs/trimslice_defconfig')
| -rw-r--r-- | configs/trimslice_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index e3c45f9603..ee40218d1c 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_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_SFLASH=y CONFIG_USB=y |