]> git.dujemihanovic.xyz Git - u-boot.git/commit
projects / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af7c03e) | patch
tegra: Remove merge markers in some Kconfig files
authorSimon Glass <sjg@chromium.org>
Fri, 4 Dec 2015 15:58:37 +0000 (08:58 -0700)
committerTom Rini <trini@konsulko.com>
Sat, 5 Dec 2015 23:22:37 +0000 (18:22 -0500)
commit7705bdfcd746b8465fec8b3375cba78827884d22
tree6732eaaa1510b73e9f8996f0f93bafddbe70c5batree | snapshot
parentaf7c03ea883efb939ab93b360639098569574626commit | diff
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>
configs/beaver_defconfig diff | blob | history
configs/cardhu_defconfig diff | blob | history
configs/jetson-tk1_defconfig diff | blob | history
configs/trimslice_defconfig diff | blob | history
My U-Boot fork