git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
ixp4xx_eth.c
diff --git
a/drivers/net/arm/ixp4xx_eth.c
b/drivers/net/arm/ixp4xx_eth.c
index
26af411
..
5fce1d5
100644
(file)
--- a/
drivers/net/arm/ixp4xx_eth.c
+++ b/
drivers/net/arm/ixp4xx_eth.c
@@
-504,7
+504,7
@@
static int eth_poll(struct napi_struct *napi, int budget)
netif_rx_complete(napi);
qmgr_enable_irq(rxq);
if (!qmgr_stat_empty(rxq) &&
- netif_rx_reschedule(
dev,
napi)) {
+ netif_rx_reschedule(napi)) {
#if DEBUG_RX
printk(KERN_DEBUG "%s: eth_poll"
" netif_rx_reschedule successed\n",