* [PATCH] e1000e: Fix header includes
@ 2007-08-08 23:15 Auke Kok
2007-08-09 23:06 ` Chuck Ebbert
0 siblings, 1 reply; 3+ messages in thread
From: Auke Kok @ 2007-08-08 23:15 UTC (permalink / raw)
To: jeff; +Cc: akpm, netdev, john.ronciak, auke-jan.h.kok
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000e/82571.c | 4 ++++
drivers/net/e1000e/e1000.h | 7 ++++---
drivers/net/e1000e/es2lan.c | 5 +++++
drivers/net/e1000e/ethtool.c | 3 ++-
drivers/net/e1000e/hw.h | 2 ++
drivers/net/e1000e/ich8lan.c | 5 +++++
drivers/net/e1000e/lib.c | 2 ++
drivers/net/e1000e/netdev.c | 1 +
8 files changed, 25 insertions(+), 4 deletions(-)
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..0ea6eda 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -29,6 +29,7 @@
#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/netdevice.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] e1000e: Fix header includes
2007-08-08 23:15 [PATCH] e1000e: Fix header includes Auke Kok
@ 2007-08-09 23:06 ` Chuck Ebbert
2007-08-09 23:15 ` Kok, Auke
0 siblings, 1 reply; 3+ messages in thread
From: Chuck Ebbert @ 2007-08-09 23:06 UTC (permalink / raw)
To: Auke Kok; +Cc: jeff, akpm, netdev, john.ronciak
On 08/08/2007 07:15 PM, Auke Kok wrote:
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> ---
>
> drivers/net/e1000e/82571.c | 4 ++++
> drivers/net/e1000e/e1000.h | 7 ++++---
> drivers/net/e1000e/es2lan.c | 5 +++++
> drivers/net/e1000e/ethtool.c | 3 ++-
> drivers/net/e1000e/hw.h | 2 ++
> drivers/net/e1000e/ich8lan.c | 5 +++++
> drivers/net/e1000e/lib.c | 2 ++
> drivers/net/e1000e/netdev.c | 1 +
> 8 files changed, 25 insertions(+), 4 deletions(-)
>
Still broken on ppc:
drivers/net/e1000e/phy.c: In function 'e1000e_copper_link_setup_igp':
drivers/net/e1000e/phy.c:512: error: implicit declaration of function 'msleep'
drivers/net/e1000e/phy.c: In function 'e1000e_phy_has_link_generic':
drivers/net/e1000e/phy.c:1339: error: implicit declaration of function 'mdelay'
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] e1000e: Fix header includes
2007-08-09 23:06 ` Chuck Ebbert
@ 2007-08-09 23:15 ` Kok, Auke
0 siblings, 0 replies; 3+ messages in thread
From: Kok, Auke @ 2007-08-09 23:15 UTC (permalink / raw)
To: Chuck Ebbert, jeff; +Cc: akpm, netdev, john.ronciak
Chuck Ebbert wrote:
> On 08/08/2007 07:15 PM, Auke Kok wrote:
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> ---
>>
>> drivers/net/e1000e/82571.c | 4 ++++
>> drivers/net/e1000e/e1000.h | 7 ++++---
>> drivers/net/e1000e/es2lan.c | 5 +++++
>> drivers/net/e1000e/ethtool.c | 3 ++-
>> drivers/net/e1000e/hw.h | 2 ++
>> drivers/net/e1000e/ich8lan.c | 5 +++++
>> drivers/net/e1000e/lib.c | 2 ++
>> drivers/net/e1000e/netdev.c | 1 +
>> 8 files changed, 25 insertions(+), 4 deletions(-)
>>
>
> Still broken on ppc:
>
> drivers/net/e1000e/phy.c: In function 'e1000e_copper_link_setup_igp':
> drivers/net/e1000e/phy.c:512: error: implicit declaration of function 'msleep'
> drivers/net/e1000e/phy.c: In function 'e1000e_phy_has_link_generic':
> drivers/net/e1000e/phy.c:1339: error: implicit declaration of function 'mdelay'
ok, time to install git manually on my 4-year-old yellowdog ppc install :@
I'll resend a new patch to Jeff once I have this sorted out.
Auke
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-08-09 23:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-08 23:15 [PATCH] e1000e: Fix header includes Auke Kok
2007-08-09 23:06 ` Chuck Ebbert
2007-08-09 23:15 ` Kok, Auke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).