From: Tom Rini <trini@konsulko.com>
Date: Tue, 30 Jun 2020 15:43:18 +0000 (-0400)
Subject: Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot... 
X-Git-Tag: v2025.01-rc5-pxa1908~2332^2~4
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035;p=u-boot.git

Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next

- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
  used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
---

5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035
diff --cc drivers/net/pcnet.c
index d9ab37b336,8e3e3dbbce..0928bc398b
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@@ -8,8 -8,8 +8,9 @@@
  
  #include <common.h>
  #include <cpu_func.h>
+ #include <dm.h>
  #include <log.h>
 +#include <dm.h>
  #include <malloc.h>
  #include <memalign.h>
  #include <net.h>