diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 09:45:59 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 09:45:59 +1100 |
commit | 48487ee64ec61d6fa87dcf9eff600ff509a25b39 (patch) | |
tree | 109f5ddb9bee662aff6caa6a9cca6fb4f35d6a3c /drivers/net/e1000e/netdev.c | |
parent | bdb545a5974b929c6a1c4b98d21342b434572e04 (diff) | |
parent | e6358135147807351db3b7782d3e198a1bba8b62 (diff) |
Merge commit 'net-current/master'
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 91795f78c3e4..122539a0e1fe 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -345,7 +345,6 @@ no_buffers: /** * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers * @adapter: address of board private structure - * @rx_ring: pointer to receive ring structure * @cleaned_count: number of buffers to allocate this pass **/ |