diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/lasi_82596.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/lasi_82596.c')
| -rw-r--r-- | drivers/net/lasi_82596.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index a0c578585a50..6eba352c52e0 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | TBD: | 47 | TBD: |
| 48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
| 49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
| 50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
| 51 | 51 | ||
| 52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
| 53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |
| @@ -74,7 +74,6 @@ | |||
| 74 | #include <linux/ptrace.h> | 74 | #include <linux/ptrace.h> |
| 75 | #include <linux/errno.h> | 75 | #include <linux/errno.h> |
| 76 | #include <linux/ioport.h> | 76 | #include <linux/ioport.h> |
| 77 | #include <linux/slab.h> | ||
| 78 | #include <linux/interrupt.h> | 77 | #include <linux/interrupt.h> |
| 79 | #include <linux/delay.h> | 78 | #include <linux/delay.h> |
| 80 | #include <linux/netdevice.h> | 79 | #include <linux/netdevice.h> |