diff options
| author | Simon Glass <[email protected]> | 2015-12-04 08:58:37 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-12-05 18:22:37 -0500 |
| commit | 7705bdfcd746b8465fec8b3375cba78827884d22 (patch) | |
| tree | 6732eaaa1510b73e9f8996f0f93bafddbe70c5ba /include/netdev.h | |
| 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 <[email protected]>
Reported-by: Stephen Warren <[email protected]>
Tested-by: Stephen Warren <[email protected]>
Reported-by: Kevin Hilman <[email protected]>
Acked-by: Thomas Chou <[email protected]>
Diffstat (limited to 'include/netdev.h')
0 files changed, 0 insertions, 0 deletions