| commit | 7705bdfcd746b8465fec8b3375cba78827884d22 | [log] [tgz] |
|---|---|---|
| author | Simon Glass <sjg@chromium.org> | Fri Dec 04 08:58:37 2015 -0700 |
| committer | Tom Rini <trini@konsulko.com> | Sat Dec 05 18:22:37 2015 -0500 |
| tree | 6732eaaa1510b73e9f8996f0f93bafddbe70c5ba | |
| parent | af7c03ea883efb939ab93b360639098569574626 [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>