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/pcnet.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/pcnet.c')
-rw-r--r-- | drivers/net/pcnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index 0928bc398b1..559560860bd 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -459,7 +459,7 @@ static void pcnet_halt_common(struct pcnet_priv *lp) } #ifndef CONFIG_DM_ETH -static int pcnet_init(struct eth_device *dev, bd_t *bis) +static int pcnet_init(struct eth_device *dev, struct bd_info *bis) { struct pcnet_priv *lp = dev->priv; @@ -495,7 +495,7 @@ static void pcnet_halt(struct eth_device *dev) pcnet_halt_common(lp); } -int pcnet_initialize(bd_t *bis) +int pcnet_initialize(struct bd_info *bis) { pci_dev_t devbusfn; struct eth_device *dev; |