diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 18:26:49 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 18:26:49 +0200 |
| commit | 692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch) | |
| tree | a9e49c040d361ea2293a8966832378def5a06714 /drivers/of/of_net.c | |
| parent | Input: mousedev - fix race when creating mixed device (diff) | |
| parent | Input: edt-ft5x06 - add a missing condition (diff) | |
| download | linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.xz linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.zip | |
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'drivers/of/of_net.c')
| -rw-r--r-- | drivers/of/of_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c index 8f9be2e09937..a208a457558c 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -30,6 +30,7 @@ static const char *phy_modes[] = { [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid", [PHY_INTERFACE_MODE_RTBI] = "rtbi", [PHY_INTERFACE_MODE_SMII] = "smii", + [PHY_INTERFACE_MODE_XGMII] = "xgmii", }; /** |