OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7bcae4
)
amd: xgbe: fix duplicate #include of linux/phy.h
author
Jean Sacren
<sakiwit@gmail.com>
Thu, 7 Aug 2014 12:50:43 +0000
(06:50 -0600)
committer
David S. Miller
<davem@davemloft.net>
Thu, 7 Aug 2014 23:02:57 +0000
(16:02 -0700)
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>
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index
1f5487f
..
dc84f71
100644
(file)
--- 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>