From: Jean Sacren <sakiwit@gmail.com>
Date: Thu, 7 Aug 2014 12:50:43 +0000 (-0600)
Subject: amd: xgbe: fix duplicate #include of linux/phy.h
X-Git-Tag: v3.17-rc1~33^2~41
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=67f2527a68fc0ffc467ed43cbff301a24256f702;p=~emulex%2Finfiniband.git

amd: xgbe: fix duplicate #include of linux/phy.h

The header linux/phy.h was included twice, so delete one of them.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 1f5487f4888..dc84f7193c2 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -117,7 +117,6 @@
 #include <linux/spinlock.h>
 #include <linux/tcp.h>
 #include <linux/if_vlan.h>
-#include <linux/phy.h>
 #include <net/busy_poll.h>
 #include <linux/clk.h>
 #include <linux/if_ether.h>