diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/net/ethernet/nvidia | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/nvidia')
| -rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 84952b308f83..d93a088debc3 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
| @@ -69,7 +69,6 @@ | |||
| 69 | #include <linux/io.h> | 69 | #include <linux/io.h> |
| 70 | 70 | ||
| 71 | #include <asm/irq.h> | 71 | #include <asm/irq.h> |
| 72 | #include <asm/system.h> | ||
| 73 | 72 | ||
| 74 | #define TX_WORK_PER_LOOP 64 | 73 | #define TX_WORK_PER_LOOP 64 |
| 75 | #define RX_WORK_PER_LOOP 64 | 74 | #define RX_WORK_PER_LOOP 64 |