diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 05:41:03 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 05:41:03 +0800 |
| commit | 5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a (patch) | |
| tree | 57c9fc4aae86d6dc4dacb921e673ac6b0deac26d /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | a4f2dc9efc00a56ca30ce340a1405293ec9488a4 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
| download | blackbird-op-linux-5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a.tar.gz blackbird-op-linux-5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a.zip | |
Merge 3.11-rc4 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index e5da07858a2f..e06186c305d8 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -12026,7 +12026,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { .ndo_fcoe_get_wwn = bnx2x_fcoe_get_wwn, #endif -#ifdef CONFIG_NET_LL_RX_POLL +#ifdef CONFIG_NET_RX_BUSY_POLL .ndo_busy_poll = bnx2x_low_latency_recv, #endif }; |
