summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-19 09:33:38 -0600
committerJoe Hershberger <joe.hershberger@ni.com>2015-08-21 16:32:32 -0500
commitc752cd2a30517c3a8c0742d807ce5053b747baa8 (patch)
treef3e75eac62d92abfa1a0afa85f23ab8a6e719135
parent19a4fbaaddd6542b46120d786bc375aee1b9e257 (diff)
net: e1000: Move #include of common.h to the C files
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
-rw-r--r--drivers/net/e1000.c1
-rw-r--r--drivers/net/e1000.h1
-rw-r--r--drivers/net/e1000_spi.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index e81641054d..187517b7d1 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 23a81e6c2d..989f01df7a 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 93043a1ade..e7f68263a4 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>