diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:47:18 -0400 |
| commit | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch) | |
| tree | 1db633712bd47ce72ac5a1aed62b3417733ac63a /drivers/net/tulip/uli526x.c | |
| parent | 1e231efe50ffe4d291be24d2fe393188de9c4b08 (diff) | |
| parent | 3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tulip/uli526x.c')
| -rw-r--r-- | drivers/net/tulip/uli526x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index 5ae22b7bc5ca..1a4316336256 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
| 24 | #include <linux/ptrace.h> | ||
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| @@ -34,6 +33,7 @@ | |||
| 34 | #include <linux/skbuff.h> | 33 | #include <linux/skbuff.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/dma-mapping.h> | ||
| 37 | 37 | ||
| 38 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
| 39 | #include <asm/bitops.h> | 39 | #include <asm/bitops.h> |