diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
| commit | 4afb09cc67098a71513db9e39a3d3ebeff64c527 (patch) | |
| tree | c24d467e1a50ad71bb57642d83c5cf55c34af131 /include/linux/marvell_phy.h | |
| parent | 5a30fae8c7d437d610348e5f05153e60f086c0c2 (diff) | |
| parent | 2a2ee7aafa9a1fab4e610cfd2967991a35b44ef0 (diff) | |
| download | barebox-4afb09cc67098a71513db9e39a3d3ebeff64c527.tar.gz barebox-4afb09cc67098a71513db9e39a3d3ebeff64c527.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'include/linux/marvell_phy.h')
| -rw-r--r-- | include/linux/marvell_phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index b7baae137d..9e7c8b7596 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -27,8 +27,8 @@ #define MARVELL_PHY_ID_88E1318S 0x01410e90 #define MARVELL_PHY_ID_88E1116R 0x01410e40 #define MARVELL_PHY_ID_88E1510 0x01410dd0 +#define MARVELL_PHY_ID_88E1540 0x01410eb0 #define MARVELL_PHY_ID_88E1543 0x01410ea0 -#define MARVELL_PHY_ID_88E1545 0x01410eb0 /* Mask used for ID comparisons */ #define MARVELL_PHY_ID_MASK 0xfffffff0 |