forked from Minki/linux
r8169: incorrect identifier for a 8168dp
Merge error. See CFG_METHOD_8 (0x3c800000 + 0x00300000) since version 8.002.00 of Realtek's driver. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Hayes <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
635f081541
commit
17c9929721
@ -1316,7 +1316,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
|
|||||||
{ 0x7c800000, 0x28000000, RTL_GIGA_MAC_VER_26 },
|
{ 0x7c800000, 0x28000000, RTL_GIGA_MAC_VER_26 },
|
||||||
|
|
||||||
/* 8168C family. */
|
/* 8168C family. */
|
||||||
{ 0x7cf00000, 0x3ca00000, RTL_GIGA_MAC_VER_24 },
|
{ 0x7cf00000, 0x3cb00000, RTL_GIGA_MAC_VER_24 },
|
||||||
{ 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 },
|
{ 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 },
|
||||||
{ 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 },
|
{ 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 },
|
||||||
{ 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_24 },
|
{ 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_24 },
|
||||||
|
Loading…
Reference in New Issue
Block a user