[U-Boot] [U-Boot, 1/4] tegra: Remove merge markers in some Kconfig files

[Tom Rini]

On Fri, Dec 04, 2015 at 08:58:37AM -0700, Simon Glass wrote:

> 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 at chromium.org>
> Reported-by: Stephen Warren <swarren at nvidia.com>
> Tested-by: Stephen Warren <swarren at nvidia.com>
> Reported-by: Kevin Hilman <khilman at linaro.org>
> Acked-by: Thomas Chou <thomas at wytron.com.tw>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/3dbcf8ea/attachment.sig>