diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
| commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
| tree | c23540ea1425e9891b39cdff550e90caaba38163 /include/linux/netdevice.h | |
| parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
| download | lwn-c7abc19ca6d48392f91ca04ebe1e9813b3ace435.tar.gz lwn-c7abc19ca6d48392f91ca04ebe1e9813b3ace435.zip | |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0741a1e919a5..9a4156845e93 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -973,7 +973,7 @@ struct net_device_ops { gfp_t gfp); void (*ndo_netpoll_cleanup)(struct net_device *dev); #endif -#ifdef CONFIG_NET_LL_RX_POLL +#ifdef CONFIG_NET_RX_BUSY_POLL int (*ndo_busy_poll)(struct napi_struct *dev); #endif int (*ndo_set_vf_mac)(struct net_device *dev, |