projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-cpuidle', 'pm-sleep' and 'pm-powercap'
[linux-block.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
common.h
diff --git
a/drivers/net/ethernet/stmicro/stmmac/common.h
b/drivers/net/ethernet/stmicro/stmmac/common.h
index a6fefe675ef1520566ccdcafaac705f0ee159e42..3b7d4ac1e7be07cb2a0fc796f73b671ed535f01d 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/
drivers/net/ethernet/stmicro/stmmac/common.h
@@
-553,6
+553,7
@@
extern const struct stmmac_hwtimestamp stmmac_ptp;
extern const struct stmmac_mode_ops dwmac4_ring_mode_ops;
struct mac_link {
+ u32 caps;
u32 speed_mask;
u32 speed10;
u32 speed100;