diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-16 19:15:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-16 19:15:21 -0700 |
| commit | ed607b82cad5bc72957b4c8c4b35670950c3b0de (patch) | |
| tree | f30ecee25e4f64fa837c827154ab15095ec3785c /include/linux | |
| parent | c9d26423e56ce1ab4d786f92aebecf859d419293 (diff) | |
| parent | 82c084f56a01160afa39d4b6899b66c7153d0002 (diff) | |
Merge branch 'bcm7xxx'
Florian Fainelli says:
====================
net: phy: bcm7xxx internal PHY fixes
Here are 3 small fixes for the Broadcom BCM7xxx internal PHY targeting
suspend/resume issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/brcmphy.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 6f76277baf39..61219b9b3445 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -16,7 +16,6 @@ #define PHY_ID_BCM7366 0x600d8490 #define PHY_ID_BCM7439 0x600d8480 #define PHY_ID_BCM7445 0x600d8510 -#define PHY_ID_BCM7XXX_28 0x600d8400 #define PHY_BCM_OUI_MASK 0xfffffc00 #define PHY_BCM_OUI_1 0x00206000 |