projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
ucc_geth.h
diff --git
a/drivers/net/ucc_geth.h
b/drivers/net/ucc_geth.h
index
5beba4c
..
195ab26
100644
(file)
--- a/
drivers/net/ucc_geth.h
+++ b/
drivers/net/ucc_geth.h
@@
-1125,6
+1125,7
@@
struct ucc_geth_info {
u16 pausePeriod;
u16 extensionField;
struct device_node *phy_node;
u16 pausePeriod;
u16 extensionField;
struct device_node *phy_node;
+ struct device_node *tbi_node;
u8 weightfactor[NUM_TX_QUEUES];
u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];
u8 weightfactor[NUM_TX_QUEUES];
u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];
@@
-1213,7
+1214,6
@@
struct ucc_geth_private {
struct ugeth_mii_info *mii_info;
struct phy_device *phydev;
struct ugeth_mii_info *mii_info;
struct phy_device *phydev;
- struct phy_device *tbiphy;
phy_interface_t phy_interface;
int max_speed;
uint32_t msg_enable;
phy_interface_t phy_interface;
int max_speed;
uint32_t msg_enable;