Merge git://git.denx.de/u-boot-sunxi

[u-boot] / configs / edison_defconfig

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index d099c0b0dcd0d4bc2d807c1db1cee15acb33ce02..d3b67c336f4789045fb3f2706d880fa771d1667c 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -33,8 +33,9 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Intel"
-CONFIG_G_DNL_VENDOR_NUM=0x8087
-CONFIG_G_DNL_PRODUCT_NUM=0x0a99
+CONFIG_USB_GADGET_MANUFACTURER="Intel"
+CONFIG_USB_GADGET_VENDOR_NUM=0x8087
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99
+# CONFIG_USB_HOST_ETHER is not set
 CONFIG_FAT_WRITE=y
 CONFIG_SHA1=y