diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /drivers/net/e1000.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 9212920549d..008da4ab3e7 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -30,13 +30,18 @@ tested on both gig copper and gig fiber boards */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> +#include <log.h> #include <malloc.h> #include <memalign.h> +#include <net.h> #include <pci.h> +#include <linux/delay.h> #include "e1000.h" +#include <asm/cache.h> #define TOUT_LOOP 100000 @@ -5759,8 +5764,8 @@ struct e1000_hw *e1000_find_card(unsigned int cardnum) #endif /* !CONFIG_DM_ETH */ #ifdef CONFIG_CMD_E1000 -static int do_e1000(cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]) +static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { unsigned char *mac = NULL; #ifdef CONFIG_DM_ETH |