From de28da8f95e50e76be9ad2f65087857168fb791f Mon Sep 17 00:00:00 2001
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Wed, 6 Jan 2010 23:07:21 +0000
Subject: [PATCH] --- yaml --- r: 183466 b: refs/heads/master c:
 5e33c791233b7da47b5403344a915c1b7edaaad8 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/stmmac/common.h      | 2 +-
 trunk/drivers/net/stmmac/dwmac100.c    | 1 -
 trunk/drivers/net/stmmac/dwmac1000.h   | 1 -
 trunk/drivers/net/stmmac/stmmac_main.c | 1 -
 trunk/drivers/net/stmmac/stmmac_mdio.c | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 12e7ae2fc511..548e5380af73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21d437cc66dcfd0119a4905214fbbe19f3e276dc
+refs/heads/master: 5e33c791233b7da47b5403344a915c1b7edaaad8
diff --git a/trunk/drivers/net/stmmac/common.h b/trunk/drivers/net/stmmac/common.h
index 25b53d411516..7267bcd43d06 100644
--- a/trunk/drivers/net/stmmac/common.h
+++ b/trunk/drivers/net/stmmac/common.h
@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include "descs.h"
-#include <linux/io.h>
+#include <linux/netdevice.h>
 
 struct stmmac_extra_stats {
 	/* Transmit errors */
diff --git a/trunk/drivers/net/stmmac/dwmac100.c b/trunk/drivers/net/stmmac/dwmac100.c
index 010c8b206359..82dde774d4c5 100644
--- a/trunk/drivers/net/stmmac/dwmac100.c
+++ b/trunk/drivers/net/stmmac/dwmac100.c
@@ -26,7 +26,6 @@
   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
-#include <linux/netdevice.h>
 #include <linux/crc32.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
diff --git a/trunk/drivers/net/stmmac/dwmac1000.h b/trunk/drivers/net/stmmac/dwmac1000.h
index 3d54d6c99129..62dca0e384e7 100644
--- a/trunk/drivers/net/stmmac/dwmac1000.h
+++ b/trunk/drivers/net/stmmac/dwmac1000.h
@@ -20,7 +20,6 @@
   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
-#include <linux/netdevice.h>
 #include <linux/phy.h>
 #include "common.h"
 
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
index 16d4e1cecf8f..a6733612d64a 100644
--- a/trunk/drivers/net/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -32,7 +32,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/platform_device.h>
 #include <linux/ip.h>
diff --git a/trunk/drivers/net/stmmac/stmmac_mdio.c b/trunk/drivers/net/stmmac/stmmac_mdio.c
index 131e0a603711..fffe1d037fe6 100644
--- a/trunk/drivers/net/stmmac/stmmac_mdio.c
+++ b/trunk/drivers/net/stmmac/stmmac_mdio.c
@@ -24,7 +24,6 @@
   Maintainer: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
-#include <linux/netdevice.h>
 #include <linux/mii.h>
 #include <linux/phy.h>