From 5415e6588fb09770492b723304deb5185fe06ea5 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 11 Apr 2012 07:18:37 +0000 Subject: [PATCH] --- yaml --- r: 300600 b: refs/heads/master c: 0db0cfcc4ddff3226c8c721760b6a4eaf0e5229a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/rdc/r6040.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 639e78eac9ed..275895e31940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90f750a81a29587846e907d2c8ed60a0586ce632 +refs/heads/master: 0db0cfcc4ddff3226c8c721760b6a4eaf0e5229a diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c index c10b0b89626b..fa2959689d87 100644 --- a/trunk/drivers/net/ethernet/rdc/r6040.c +++ b/trunk/drivers/net/ethernet/rdc/r6040.c @@ -187,7 +187,7 @@ struct r6040_private { dma_addr_t rx_ring_dma; dma_addr_t tx_ring_dma; u16 tx_free_desc; - u16 mcr0, mcr1; + u16 mcr0; struct net_device *dev; struct mii_bus *mii_bus; struct napi_struct napi;