Merge master.kernel.org:/home/davem/BK/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge master.kernel.org:/home/davem/BK/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
583953a5 · Linus Torvalds · 9add6ead · 6de145dc · 583953a5 · 583953a5
Commit 583953a5 authored Apr 15, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/net/e1000/e1000.h drivers/net/e1000/e1000.h +1 -0

drivers/net/ixgb/ixgb.h drivers/net/ixgb/ixgb.h +1 -0

No files found.
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -52,6 +52,7 @@
 #include <linux/interrupt.h>
 #include <linux/string.h>
 #include <linux/pagemap.h>
+#include <linux/dma-mapping.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>

--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -43,6 +43,7 @@
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/pagemap.h>
+#include <linux/dma-mapping.h>
 #include <linux/bitops.h>
 #include <linux/in.h>
 #include <linux/ip.h>