From cc30702618768d92e371ab891acbc4cfc6911f9d Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 15 Feb 2010 12:13:16 -0800
Subject: [PATCH] --- yaml --- r: 182113 b: refs/heads/master c:
 1d08f00d576c62f1c7a96900a14648df33b3939a h: refs/heads/master i:   182111:
 6fc68cfad274f42cb0ab42822d86812e13a67101 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/octeon/ethernet-mdio.h  | 1 -
 trunk/drivers/staging/octeon/ethernet-rgmii.c | 1 -
 trunk/drivers/staging/octeon/ethernet-sgmii.c | 1 -
 trunk/drivers/staging/octeon/ethernet-spi.c   | 1 -
 trunk/drivers/staging/octeon/ethernet-xaui.c  | 1 -
 trunk/drivers/staging/octeon/ethernet.c       | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2472a42c605b..afe42e19cc60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d007f991a82ed159979b7662a4ca20e978221cdb
+refs/heads/master: 1d08f00d576c62f1c7a96900a14648df33b3939a
diff --git a/trunk/drivers/staging/octeon/ethernet-mdio.h b/trunk/drivers/staging/octeon/ethernet-mdio.h
index 55d0614a7cd9..a417d4fce12c 100644
--- a/trunk/drivers/staging/octeon/ethernet-mdio.h
+++ b/trunk/drivers/staging/octeon/ethernet-mdio.h
@@ -32,7 +32,6 @@
 #include <linux/ip.h>
 #include <linux/string.h>
 #include <linux/ethtool.h>
-#include <linux/mii.h>
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
 #include <net/dst.h>
diff --git a/trunk/drivers/staging/octeon/ethernet-rgmii.c b/trunk/drivers/staging/octeon/ethernet-rgmii.c
index 3820f1ec11d1..f90d46ed5640 100644
--- a/trunk/drivers/staging/octeon/ethernet-rgmii.c
+++ b/trunk/drivers/staging/octeon/ethernet-rgmii.c
@@ -26,7 +26,6 @@
 **********************************************************************/
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/mii.h>
 #include <net/dst.h>
 
 #include <asm/octeon/octeon.h>
diff --git a/trunk/drivers/staging/octeon/ethernet-sgmii.c b/trunk/drivers/staging/octeon/ethernet-sgmii.c
index 6061d01eca2d..2d8589eb461e 100644
--- a/trunk/drivers/staging/octeon/ethernet-sgmii.c
+++ b/trunk/drivers/staging/octeon/ethernet-sgmii.c
@@ -26,7 +26,6 @@
 **********************************************************************/
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/mii.h>
 #include <net/dst.h>
 
 #include <asm/octeon/octeon.h>
diff --git a/trunk/drivers/staging/octeon/ethernet-spi.c b/trunk/drivers/staging/octeon/ethernet-spi.c
index 00dc0f4bad19..b58b8971f939 100644
--- a/trunk/drivers/staging/octeon/ethernet-spi.c
+++ b/trunk/drivers/staging/octeon/ethernet-spi.c
@@ -26,7 +26,6 @@
 **********************************************************************/
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/mii.h>
 #include <net/dst.h>
 
 #include <asm/octeon/octeon.h>
diff --git a/trunk/drivers/staging/octeon/ethernet-xaui.c b/trunk/drivers/staging/octeon/ethernet-xaui.c
index ee3dc41b2c53..3fca1cc31ed8 100644
--- a/trunk/drivers/staging/octeon/ethernet-xaui.c
+++ b/trunk/drivers/staging/octeon/ethernet-xaui.c
@@ -26,7 +26,6 @@
 **********************************************************************/
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/mii.h>
 #include <net/dst.h>
 
 #include <asm/octeon/octeon.h>
diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c
index 9d632020b9ee..5afece0216ca 100644
--- a/trunk/drivers/staging/octeon/ethernet.c
+++ b/trunk/drivers/staging/octeon/ethernet.c
@@ -29,7 +29,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/delay.h>
 #include <linux/phy.h>
 
 #include <net/dst.h>