diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/net/amd8111e.c | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rwxr-xr-x | drivers/net/amd8111e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 8618012df06a..d9ba8be72af8 100755 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -1290,7 +1290,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id, struct pt_regs *reg | |||
| 1290 | writel(intr0, mmio + INT0); | 1290 | writel(intr0, mmio + INT0); |
| 1291 | 1291 | ||
| 1292 | /* Check if Receive Interrupt has occurred. */ | 1292 | /* Check if Receive Interrupt has occurred. */ |
| 1293 | #if CONFIG_AMD8111E_NAPI | 1293 | #ifdef CONFIG_AMD8111E_NAPI |
| 1294 | if(intr0 & RINT0){ | 1294 | if(intr0 & RINT0){ |
| 1295 | if(netif_rx_schedule_prep(dev)){ | 1295 | if(netif_rx_schedule_prep(dev)){ |
| 1296 | /* Disable receive interupts */ | 1296 | /* Disable receive interupts */ |