Skip to content

L
linux
Commit 583953a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 9add6ead 6de145dc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/net/e1000/e1000.h
View file @ 583953a5
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/dma-mapping.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
......
drivers/net/ixgb/ixgb.h
View file @ 583953a5
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/dma-mapping.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/ip.h> #include <linux/ip.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7