summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-19 16:26:46 -0700
committerDavid S. Miller <davem@davemloft.net>2011-06-19 16:26:46 -0700
commit00ce2d5614a67521241d024c6e50afe3bd3df049 (patch)
treea0348045585f2d2c6c990710dca2f40a67e644bb
parentcefa9993f161c1c2b6b91b7ea2e84a9bfbd43d2e (diff)
parent3744100e05c4e403ed21c99cd389c7e784664e4b (diff)
downloadkernel-uprobes-00ce2d5614a67521241d024c6e50afe3bd3df049.tar.gz
kernel-uprobes-00ce2d5614a67521241d024c6e50afe3bd3df049.tar.xz
kernel-uprobes-00ce2d5614a67521241d024c6e50afe3bd3df049.zip
Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
-rw-r--r--drivers/net/r8169.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index ef1ce2ebeb4..05d81780d1f 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1621,7 +1621,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
*
* (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
*/
- static const struct {
+ static const struct rtl_mac_info {
u32 mask;
u32 val;
int mac_version;
@@ -1689,7 +1689,8 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
/* Catch-all */
{ 0x00000000, 0x00000000, RTL_GIGA_MAC_NONE }
- }, *p = mac_info;
+ };
+ const struct rtl_mac_info *p = mac_info;
u32 reg;
reg = RTL_R32(TxConfig);
@@ -3681,7 +3682,7 @@ static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)
static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
{
- static const struct {
+ static const struct rtl_cfg2_info {
u32 mac_version;
u32 clk;
u32 val;
@@ -3690,7 +3691,8 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
{ RTL_GIGA_MAC_VER_05, PCI_Clock_66MHz, 0x000fffff },
{ RTL_GIGA_MAC_VER_06, PCI_Clock_33MHz, 0x00ffff00 }, // 8110SCe
{ RTL_GIGA_MAC_VER_06, PCI_Clock_66MHz, 0x00ffffff }
- }, *p = cfg2_info;
+ };
+ const struct rtl_cfg2_info *p = cfg2_info;
unsigned int i;
u32 clk;