diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
| commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
| tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /drivers/net/ucc_geth.h | |
| parent | 80595d59ba9917227856e663da249c2276a8628d (diff) | |
| parent | 905db44087855e3c1709f538ecdc22fd149cadd8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000/e1000_main.c
Diffstat (limited to 'drivers/net/ucc_geth.h')
| -rw-r--r-- | drivers/net/ucc_geth.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 8f699cb773ee..16cbe42ba43c 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
| @@ -1186,6 +1186,8 @@ struct ucc_geth_private { | |||
| 1186 | int oldspeed; | 1186 | int oldspeed; |
| 1187 | int oldduplex; | 1187 | int oldduplex; |
| 1188 | int oldlink; | 1188 | int oldlink; |
| 1189 | |||
| 1190 | struct device_node *node; | ||
| 1189 | }; | 1191 | }; |
| 1190 | 1192 | ||
| 1191 | void uec_set_ethtool_ops(struct net_device *netdev); | 1193 | void uec_set_ethtool_ops(struct net_device *netdev); |