usb: add support for generic EHCI devices

[people/ms/u-boot.git] / configs / beaver_defconfig

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 29303441d92e73c7438b2b7d2f13472de843c3e8..8add08d76d5fc6504f124380fc35a766899a105b 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y