From 6096d2bfc58125508c95e36c3eaff768337a63c0 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 29 Apr 2011 07:41:07 +0200
Subject: [PATCH] --- yaml --- r: 249261 b: refs/heads/master c:
 8016a34d95f281ad6497978a21124236a7eaa6cf h: refs/heads/master i:   249259:
 1ef25b275a80e96a9fe5e1cdca93f0e5d1e3e78b v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c  | 3 ---
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a5becf76d1dd..a196e1a10ed1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfff928a7a8bf946570adce259e80635321e82b
+refs/heads/master: 8016a34d95f281ad6497978a21124236a7eaa6cf
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 97a29268bb65..5d8538296515 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -593,8 +593,6 @@ static void ft1000_reset_asic(struct net_device *dev)
 
 	DEBUG("ft1000_hw:ft1000_reset_asic called\n");
 
-	info->ASICResetNum++;
-
 	/* Let's use the register provided by the Magnemite ASIC to reset the
 	 * ASIC and DSP.
 	 */
@@ -748,7 +746,6 @@ int init_ft1000_netdev(struct ft1000_device *ft1000dev)
 	spin_lock_init(&pInfo->dpram_lock);
 	pInfo->pFt1000Dev = ft1000dev;
 	pInfo->DrvErrNum = 0;
-	pInfo->ASICResetNum = 0;
 	pInfo->registered = 1;
 	pInfo->ft1000_reset = ft1000_reset;
 	pInfo->mediastate = 0;
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 4111e5c3a056..55ba1adc3a10 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -496,7 +496,6 @@ struct ft1000_info {
     bool fAppMsgPend;
     u16 DrvErrNum;
     u16 AsicID;
-    int ASICResetNum;
     int DspAsicReset;
     int DSPResetNum;
     int DeviceCreated;