projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
635f081
)
r8169: incorrect identifier for a 8168dp
author
Francois Romieu
<romieu@fr.zoreil.com>
Mon, 12 Jul 2010 00:10:09 +0000
(17:10 -0700)
committer
David S. Miller
<davem@davemloft.net>
Mon, 12 Jul 2010 00:10:09 +0000
(17:10 -0700)
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>
drivers/net/r8169.c
patch
|
blob
|
history
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index
96b6cfb
..
cdc6a5c
100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-1316,7
+1316,7
@@
static void rtl8169_get_mac_version(struct rtl8169_private *tp,
{ 0x7c800000, 0x28000000, RTL_GIGA_MAC_VER_26 },
/* 8168C family. */
- { 0x7cf00000, 0x3c
a
00000, RTL_GIGA_MAC_VER_24 },
+ { 0x7cf00000, 0x3c
b
00000, RTL_GIGA_MAC_VER_24 },
{ 0x7cf00000, 0x3c900000, RTL_GIGA_MAC_VER_23 },
{ 0x7cf00000, 0x3c800000, RTL_GIGA_MAC_VER_18 },
{ 0x7c800000, 0x3c800000, RTL_GIGA_MAC_VER_24 },