Merge redhat.com:/home/jgarzik/repo/linus-2.5

into redhat.com:/home/jgarzik/repo/net-drivers-2.5

Merge redhat.com:/home/jgarzik/repo/linus-2.5
into redhat.com:/home/jgarzik/repo/net-drivers-2.5
d0051184 · Jeff Garzik · 56c32f41 · 51449c8c · d0051184 · d0051184
Commit d0051184 authored Nov 07, 2002 by Jeff Garzik
Expand all Show whitespace changes
Inline Side-by-side

Showing with 370 additions and 120 deletions

drivers/net/dl2k.c drivers/net/dl2k.c +200 -38

drivers/net/dl2k.h drivers/net/dl2k.h +2 -0

drivers/net/sundance.c drivers/net/sundance.c +168 -82

No files found.
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -27,9 +27,11 @@
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
+#include <linux/ethtool.h>
 #include <asm/processor.h>	/* Processor type for cache alignment. */
 #include <asm/bitops.h>
 #include <asm/io.h>
+#include <asm/uaccess.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/time.h>

--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c