diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /drivers/net/e1000.c | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 008da4ab3e7..49be7667021 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5634,7 +5634,7 @@ e1000_disable(struct eth_device *nic) INIT - set up ethernet interface(s) ***************************************************************************/ static int -e1000_init(struct eth_device *nic, bd_t *bis) +e1000_init(struct eth_device *nic, struct bd_info *bis) { struct e1000_hw *hw = nic->priv; @@ -5700,7 +5700,7 @@ PROBE - Look for an adapter, this routine's visible to the outside You should omit the last argument struct pci_device * for a non-PCI NIC ***************************************************************************/ int -e1000_initialize(bd_t * bis) +e1000_initialize(struct bd_info * bis) { unsigned int i; pci_dev_t devno; |