diff options
| author | Simon Glass <sjg@chromium.org> | 2015-12-04 08:58:37 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-05 18:22:37 -0500 |
| commit | 7705bdfcd746b8465fec8b3375cba78827884d22 (patch) | |
| tree | 6732eaaa1510b73e9f8996f0f93bafddbe70c5ba /arch/arm/Kconfig | |
| parent | af7c03ea883efb939ab93b360639098569574626 (diff) | |
| download | u-boot-imx-7705bdfcd746b8465fec8b3375cba78827884d22.zip u-boot-imx-7705bdfcd746b8465fec8b3375cba78827884d22.tar.gz u-boot-imx-7705bdfcd746b8465fec8b3375cba78827884d22.tar.bz2 | |
tegra: Remove merge markers in some Kconfig files
These were added by mistake in commit fde7e189. They cause a warning when
configuring the boards. Remove them.
Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Reported-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Diffstat (limited to 'arch/arm/Kconfig')
0 files changed, 0 insertions, 0 deletions