diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-05-19 00:39:34 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-19 00:39:34 +0300 |
commit | 90223c1136b2930751116fb7de9675f55843f3ad (patch) | |
tree | ad66d6f6fe5deb321b82ed4efff70e748e8f21df /drivers/net/ethernet/8390/ne.c | |
parent | 1ecaf17d097c91a7bd2979c57f7c81c5eeaf526b (diff) | |
parent | 1f594fe7c90746982569bd4f3489e809104a9176 (diff) | |
download | linux-90223c1136b2930751116fb7de9675f55843f3ad.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/freescale/fec_main.c
6ead9c98cafc ("net: fec: remove the xdp_return_frame when lack of tx BDs")
144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/8390/ne.c')
-rw-r--r-- | drivers/net/ethernet/8390/ne.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index cb04a3071f92..7d89ec1cf273 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -50,6 +50,7 @@ static const char version2[] = #include <linux/etherdevice.h> #include <linux/jiffies.h> #include <linux/platform_device.h> +#include <net/Space.h> #include <asm/io.h> |