[PATCH 02/21] e1000: Include <net.h> in e1000.h

Andrey Smirnov andrew.smirnov at gmail.com
Tue May 31 10:09:21 PDT 2016


That header(e1000.h) uses a number of definitions from net.h, so for it
to be self-contained it needs to include that file. This change also
allows to remove includes of net.h from other files.

Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>
---
 drivers/net/e1000/e1000.h  | 1 +
 drivers/net/e1000/eeprom.c | 1 -
 drivers/net/e1000/main.c   | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 82ff32e..19faf0b 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -17,6 +17,7 @@
  */
 
 #include <io.h>
+#include <net.h>
 
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index fb39a85..cc9199b 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -1,6 +1,5 @@
 #include <common.h>
 #include <init.h>
-#include <net.h>
 #include <malloc.h>
 
 #include "e1000.h"
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 552b0dc..f5eb086 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -31,7 +31,6 @@ tested on both gig copper and gig fiber boards
 
 #include <common.h>
 #include <init.h>
-#include <net.h>
 #include <malloc.h>
 #include <linux/pci.h>
 #include <dma.h>
-- 
2.5.5




More information about the barebox mailing list