From 5c96f82f41f608b6151fab0fb40b1f5ab84382ee Mon Sep 17 00:00:00 2001
From: Viresh KUMAR <viresh.kumar@st.com>
Date: Mon, 2 May 2011 18:36:45 +0000
Subject: [PATCH] --- yaml --- r: 247050 b: refs/heads/master c:
 57a503c61db077b923e23f36050c02166a4a1db2 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/stmmac/stmmac.h | 1 -
 trunk/include/linux/stmmac.h      | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d63244b5814..368393b35126 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e67f88dd12f610da98ca838822f2c9b4e7c6100e
+refs/heads/master: 57a503c61db077b923e23f36050c02166a4a1db2
diff --git a/trunk/drivers/net/stmmac/stmmac.h b/trunk/drivers/net/stmmac/stmmac.h
index 5f06c4706abe..2b076b313622 100644
--- a/trunk/drivers/net/stmmac/stmmac.h
+++ b/trunk/drivers/net/stmmac/stmmac.h
@@ -21,7 +21,6 @@
 *******************************************************************************/
 
 #define DRV_MODULE_VERSION	"Nov_2010"
-#include <linux/platform_device.h>
 #include <linux/stmmac.h>
 
 #include "common.h"
diff --git a/trunk/include/linux/stmmac.h b/trunk/include/linux/stmmac.h
index f29197a4b227..9529e49b0385 100644
--- a/trunk/include/linux/stmmac.h
+++ b/trunk/include/linux/stmmac.h
@@ -26,6 +26,8 @@
 #ifndef __STMMAC_PLATFORM_DATA
 #define __STMMAC_PLATFORM_DATA
 
+#include <linux/platform_device.h>
+
 /* platform data for platform device structure's platform_data field */
 
 /* Private data for the STM on-board ethernet driver */