diff mbox

[U-Boot,v7,1/6] net: e1000: Move #include of common.h to the C files

Message ID 1439998423-3994-2-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Joe Hershberger
Headers show

Commit Message

Simon Glass Aug. 19, 2015, 3:33 p.m. UTC 
We cannot currently include any header files in the C files since common.h
needs to be included first, and it is in the header file. Move it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-on: Apalis T30 2GB on Apalis Evaluation Board
---

Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 drivers/net/e1000.c     | 1 +
 drivers/net/e1000.h     | 1 -
 drivers/net/e1000_spi.c | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

Comments

Joe Hershberger Aug. 24, 2015, 2:49 p.m. UTC | #1 
On Wed, Aug 19, 2015 at 10:33 AM, Simon Glass <sjg@chromium.org> wrote:
> We cannot currently include any header files in the C files since common.h
> needs to be included first, and it is in the header file. Move it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
> Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Tested-on: Apalis T30 2GB on Apalis Evaluation Board

Applied to u-boot-net, thanks!
-Joe
diff mbox

Patch

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index d5d48b1..3bc61bf 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -29,6 +29,7 @@  tested on both gig copper and gig fiber boards
  *  Copyright 2011 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include "e1000.h"
 
 #define TOUT_LOOP   100000
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 23a81e6..989f01d 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -19,7 +19,6 @@ 
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
-#include <common.h>
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 93043a1..e7f6826 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,3 +1,4 @@ 
+#include <common.h>
 #include "e1000.h"
 #include <linux/compiler.h>