diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/e1000e | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/e1000e')
| -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 ca5d3f58329d..65fd9797d028 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -343,7 +343,6 @@ no_buffers: | |||
| 343 | /** | 343 | /** |
| 344 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers | 344 | * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers |
| 345 | * @adapter: address of board private structure | 345 | * @adapter: address of board private structure |
| 346 | * @rx_ring: pointer to receive ring structure | ||
| 347 | * @cleaned_count: number of buffers to allocate this pass | 346 | * @cleaned_count: number of buffers to allocate this pass |
| 348 | **/ | 347 | **/ |
| 349 | 348 | ||