From 8a1621127f2a60b896014ca6d8962a2f32f8c9c6 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 29 Apr 2011 07:41:08 +0200
Subject: [PATCH] --- yaml --- r: 249262 b: refs/heads/master c:
 3d20634100d9ae74d38dac70d012f2e7af4e7558 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a196e1a10ed1..97dc5f6076d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8016a34d95f281ad6497978a21124236a7eaa6cf
+refs/heads/master: 3d20634100d9ae74d38dac70d012f2e7af4e7558
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 5d8538296515..b4b4f1d23ce1 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -650,8 +650,6 @@ static int ft1000_reset_card(struct net_device *dev)
 	DEBUG("ft1000_hw:ft1000_reset_card: reset asic\n");
 	ft1000_reset_asic(dev);
 
-	info->DSPResetNum++;
-
 	DEBUG("ft1000_hw:ft1000_reset_card: call dsp_reload\n");
 	dsp_reload(ft1000dev);
 
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 55ba1adc3a10..ee47d4c18af2 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -497,7 +497,6 @@ struct ft1000_info {
     u16 DrvErrNum;
     u16 AsicID;
     int DspAsicReset;
-    int DSPResetNum;
     int DeviceCreated;
     int CardReady;
     int NetDevRegDone;