Merge branch 'master' of git://git.denx.de/u-boot-usb

Conflicts: include/configs/arndale.h Signed-off-by: Tom Rini <[email protected]>
imaami · Dec 31, 2014 · b7b3b8c · b7b3b8c
2 parents 6d76e2a + edd8890
commit b7b3b8c
Show file tree

Hide file tree

Showing 5 changed files with 719 additions and 0 deletions.
diff --git a/drivers/usb/eth/Makefile b/drivers/usb/eth/Makefile
@@ -6,5 +6,6 @@
 # new USB host ethernet layer dependencies
 obj-$(CONFIG_USB_HOST_ETHER) += usb_ether.o
 obj-$(CONFIG_USB_ETHER_ASIX) += asix.o
+obj-$(CONFIG_USB_ETHER_ASIX88179) += asix88179.o
 obj-$(CONFIG_USB_ETHER_MCS7830) += mcs7830.o
 obj-$(CONFIG_USB_ETHER_SMSC95XX) += smsc95xx.o