diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 07:30:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 07:30:17 +0200 |
| commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
| tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /drivers/net/chelsio/cxgb2.c | |
| parent | netlabel: return msg overflow error from netlbl_cipsov4_list faster (diff) | |
| parent | SAA9730: Remove driver (diff) | |
| download | linux-925068dcdc746236264d1877d3d5df656e87882a.tar.xz linux-925068dcdc746236264d1877d3d5df656e87882a.zip | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/chelsio/cxgb2.c')
| -rw-r--r-- | drivers/net/chelsio/cxgb2.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c index a509337eab2d..638c9a27a7a6 100644 --- a/drivers/net/chelsio/cxgb2.c +++ b/drivers/net/chelsio/cxgb2.c @@ -1153,9 +1153,7 @@ static int __devinit init_one(struct pci_dev *pdev, #ifdef CONFIG_NET_POLL_CONTROLLER netdev->poll_controller = t1_netpoll; #endif -#ifdef CONFIG_CHELSIO_T1_NAPI netif_napi_add(netdev, &adapter->napi, t1_poll, 64); -#endif SET_ETHTOOL_OPS(netdev, &t1_ethtool_ops); } |