diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /drivers/net/e1000e/netdev.c | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
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: | |||
| 345 | /** | 345 | /** |
| 346 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers | 346 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers |
| 347 | * @adapter: address of board private structure | 347 | * @adapter: address of board private structure |
| 348 | * @rx_ring: pointer to receive ring structure | ||
| 349 | * @cleaned_count: number of buffers to allocate this pass | 348 | * @cleaned_count: number of buffers to allocate this pass |
| 350 | **/ | 349 | **/ |
| 351 | 350 | ||