diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /drivers/net/bna/bnad.c | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'drivers/net/bna/bnad.c')
| -rw-r--r-- | drivers/net/bna/bnad.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index b9f253470da2..e588511f47fb 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c | |||
| @@ -1837,7 +1837,6 @@ bnad_setup_rx(struct bnad *bnad, uint rx_id) | |||
| 1837 | /* Initialize the Rx event handlers */ | 1837 | /* Initialize the Rx event handlers */ |
| 1838 | rx_cbfn.rcb_setup_cbfn = bnad_cb_rcb_setup; | 1838 | rx_cbfn.rcb_setup_cbfn = bnad_cb_rcb_setup; |
| 1839 | rx_cbfn.rcb_destroy_cbfn = bnad_cb_rcb_destroy; | 1839 | rx_cbfn.rcb_destroy_cbfn = bnad_cb_rcb_destroy; |
| 1840 | rx_cbfn.rcb_destroy_cbfn = NULL; | ||
| 1841 | rx_cbfn.ccb_setup_cbfn = bnad_cb_ccb_setup; | 1840 | rx_cbfn.ccb_setup_cbfn = bnad_cb_ccb_setup; |
| 1842 | rx_cbfn.ccb_destroy_cbfn = bnad_cb_ccb_destroy; | 1841 | rx_cbfn.ccb_destroy_cbfn = bnad_cb_ccb_destroy; |
| 1843 | rx_cbfn.rx_cleanup_cbfn = bnad_cb_rx_cleanup; | 1842 | rx_cbfn.rx_cleanup_cbfn = bnad_cb_rx_cleanup; |