diff options
| author | David S. Miller | 2008-11-27 08:48:40 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-11-27 08:48:40 +0100 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/e1000e | |
| parent | cxgb3: Update FW loading path. (diff) | |
| parent | netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock (diff) | |
| download | kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.gz kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.xz kernel-qcow2-linux-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.zip | |
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: /** * 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 **/ |