diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
| commit | 4246fae418f213d13ddd1829367183e94b5a7942 (patch) | |
| tree | 7bcaff8eccf086e9a87536ee74c7ebde817c71a8 /drivers/net | |
| parent | 9770f92d022211dc02fb496a7642fde1a96a2292 (diff) | |
| parent | 4155ad9aac9474610038b525da9eec8ad9afbc12 (diff) | |
| download | u-boot-4246fae418f213d13ddd1829367183e94b5a7942.tar.gz | |
Merge tag 'mmc-2-20-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- sdhci: code clean-up and fix cache coherency problem
- enable cache snooping on mpc830x
- Fix build error when MMC_WRITE disabled
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/altera_tse.c | 2 | ||||
| -rw-r--r-- | drivers/net/ftmac110.c | 2 | ||||
| -rw-r--r-- | drivers/net/macb.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index aabddd6bb6..a511068d9a 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -17,7 +17,7 @@ #include <miiphy.h> #include <net.h> #include <asm/cache.h> -#include <asm/dma-mapping.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include "altera_tse.h" diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index 1fa93d4d58..84082407d2 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -12,7 +12,7 @@ #include <net.h> #include <linux/errno.h> #include <asm/io.h> -#include <asm/dma-mapping.h> +#include <linux/dma-mapping.h> #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #include <miiphy.h> diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 0d4929bec1..631b53b093 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -38,7 +38,7 @@ #include <linux/mii.h> #include <asm/io.h> -#include <asm/dma-mapping.h> +#include <linux/dma-mapping.h> #include <asm/arch/clk.h> #include <linux/errno.h> @@ -342,7 +342,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, udelay(1); } - dma_unmap_single(packet, length, DMA_TO_DEVICE); + dma_unmap_single(paddr, length, DMA_TO_DEVICE); if (i <= MACB_TX_TIMEOUT) { if (ctrl & MACB_BIT(TX_UNDERRUN)) |