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: fde7e189 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") Signed-off-by: NSimon Glass <sjg@chromium.org> Reported-by: NStephen Warren <swarren@nvidia.com> Tested-by: NStephen Warren <swarren@nvidia.com> Reported-by: NKevin Hilman <khilman@linaro.org> Acked-by: NThomas Chou <thomas@wytron.com.tw>
Showing
想要评论请 注册 或 登录