diff options
Diffstat (limited to 'trunk/2.6.21/21354_linux-2.6-netdev-e1000e-05.patch')
-rw-r--r-- | trunk/2.6.21/21354_linux-2.6-netdev-e1000e-05.patch | 146 |
1 files changed, 146 insertions, 0 deletions
diff --git a/trunk/2.6.21/21354_linux-2.6-netdev-e1000e-05.patch b/trunk/2.6.21/21354_linux-2.6-netdev-e1000e-05.patch new file mode 100644 index 0000000..cde8bad --- /dev/null +++ b/trunk/2.6.21/21354_linux-2.6-netdev-e1000e-05.patch @@ -0,0 +1,146 @@ +From: Auke Kok <auke-jan.h.kok@intel.com> +Date: Fri, 10 Aug 2007 20:00:38 +0000 (-0700) +Subject: e1000e: Fix header includes [v2] +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Fnetdev-2.6.git;a=commitdiff_plain;h=867dbd1bea13a265f10a0685488e486836fb3910 + +e1000e: Fix header includes [v2] + +Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> +Signed-off-by: Jeff Garzik <jeff@garzik.org> +--- + +diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c +index ddf2303..0f8f0ac 100644 +--- a/drivers/net/e1000e/82571.c ++++ b/drivers/net/e1000e/82571.c +@@ -37,6 +37,10 @@ + * 82573L Gigabit Ethernet Controller + */ + ++#include <linux/netdevice.h> ++#include <linux/delay.h> ++#include <linux/pci.h> ++ + #include "e1000.h" + + #define ID_LED_RESERVED_F746 0xF746 +diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h +index a1394d6..de17537 100644 +--- a/drivers/net/e1000e/e1000.h ++++ b/drivers/net/e1000e/e1000.h +@@ -31,10 +31,11 @@ + #ifndef _E1000_H_ + #define _E1000_H_ + ++#include <linux/types.h> ++#include <linux/timer.h> ++#include <linux/workqueue.h> ++#include <linux/io.h> + #include <linux/netdevice.h> +-#include <linux/ethtool.h> +-#include <linux/pci.h> +-#include <asm/io.h> + + #include "hw.h" + +diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c +index 5604c50..8100d03 100644 +--- a/drivers/net/e1000e/es2lan.c ++++ b/drivers/net/e1000e/es2lan.c +@@ -31,6 +31,11 @@ + * 80003ES2LAN Gigabit Ethernet Controller (Serdes) + */ + ++#include <linux/netdevice.h> ++#include <linux/ethtool.h> ++#include <linux/delay.h> ++#include <linux/pci.h> ++ + #include "e1000.h" + + #define E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL 0x00 +diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c +index 6c417ea..a8fa1db 100644 +--- a/drivers/net/e1000e/ethtool.c ++++ b/drivers/net/e1000e/ethtool.c +@@ -29,8 +29,9 @@ + /* ethtool support for e1000 */ + + #include <linux/netdevice.h> +- + #include <linux/ethtool.h> ++#include <linux/pci.h> ++#include <linux/delay.h> + + #include "e1000.h" + +diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h +index 4d562c4..848217a 100644 +--- a/drivers/net/e1000e/hw.h ++++ b/drivers/net/e1000e/hw.h +@@ -29,6 +29,8 @@ + #ifndef _E1000_HW_H_ + #define _E1000_HW_H_ + ++#include <linux/types.h> ++ + struct e1000_hw; + struct e1000_adapter; + +diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c +index 042abd4..85095af 100644 +--- a/drivers/net/e1000e/ich8lan.c ++++ b/drivers/net/e1000e/ich8lan.c +@@ -40,6 +40,11 @@ + * 82566MM Gigabit Network Connection + */ + ++#include <linux/netdevice.h> ++#include <linux/ethtool.h> ++#include <linux/delay.h> ++#include <linux/pci.h> ++ + #include "e1000.h" + + #define ICH_FLASH_GFPREG 0x0000 +diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c +index 3bbe63e..c92ea77 100644 +--- a/drivers/net/e1000e/lib.c ++++ b/drivers/net/e1000e/lib.c +@@ -27,6 +27,8 @@ + *******************************************************************************/ + + #include <linux/netdevice.h> ++#include <linux/ethtool.h> ++#include <linux/delay.h> + #include <linux/pci.h> + + #include "e1000.h" +diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c +index 741965d..01a9a4f 100644 +--- a/drivers/net/e1000e/netdev.c ++++ b/drivers/net/e1000e/netdev.c +@@ -29,8 +29,10 @@ + #include <linux/module.h> + #include <linux/types.h> + #include <linux/init.h> ++#include <linux/pci.h> + #include <linux/vmalloc.h> + #include <linux/pagemap.h> ++#include <linux/delay.h> + #include <linux/netdevice.h> + #include <linux/tcp.h> + #include <linux/ipv6.h> +diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c +index 1ccbad7..c9304d8 100644 +--- a/drivers/net/e1000e/phy.c ++++ b/drivers/net/e1000e/phy.c +@@ -26,6 +26,8 @@ + + *******************************************************************************/ + ++#include <linux/delay.h> ++ + #include "e1000.h" + + static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw); |