diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
| commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
| tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /include/linux/netpoll.h | |
| parent | 612c6bd5e3f8b67505316805dc15369598f6ff57 (diff) | |
| parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/netpoll.h')
| -rw-r--r-- | include/linux/netpoll.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 67662d01130a..3ef82d3a78db 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -49,8 +49,9 @@ struct netpoll_info { }; #ifdef CONFIG_NETPOLL -extern void netpoll_poll_disable(struct net_device *dev); -extern void netpoll_poll_enable(struct net_device *dev); +void netpoll_poll_dev(struct net_device *dev); +void netpoll_poll_disable(struct net_device *dev); +void netpoll_poll_enable(struct net_device *dev); #else static inline void netpoll_poll_disable(struct net_device *dev) { return; } static inline void netpoll_poll_enable(struct net_device *dev) { return; } |