diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 08:11:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 08:11:09 -0700 |
| commit | 669c5d8d5f2be781d411ad8d52274038c795f257 (patch) | |
| tree | 86cc56ec1cb077b49e58f88c1427991e2b8fbcbc /drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | |
| parent | serial: docs: Fix filename for serial reference implementation (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | linux-dev-669c5d8d5f2be781d411ad8d52274038c795f257.tar.xz linux-dev-669c5d8d5f2be781d411ad8d52274038c795f257.zip | |
Merge 4.19-rc6 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_netdev.c')
| -rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index 929f538d28bc..538a8467f434 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -1648,9 +1648,6 @@ static const struct net_device_ops fm10k_netdev_ops = { .ndo_udp_tunnel_del = fm10k_udp_tunnel_del, .ndo_dfwd_add_station = fm10k_dfwd_add_station, .ndo_dfwd_del_station = fm10k_dfwd_del_station, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = fm10k_netpoll, -#endif .ndo_features_check = fm10k_features_check, }; |