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

---
 [refs]                                              |  2 +-
 .../drivers/staging/ft1000/ft1000-usb/ft1000_usb.h  | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a29d00854b1a..a5becf76d1dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb40876e436a025896aeb9c745e3cfb4f25700b2
+refs/heads/master: 8cfff928a7a8bf946570adce259e80635321e82b
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index bade59dc1241..4111e5c3a056 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -494,21 +494,11 @@ struct ft1000_info {
     bool fProvComplete;
     bool fCondResetPend;
     bool fAppMsgPend;
-    char *pfwimg;
-    int fwimgsz;
     u16 DrvErrNum;
-    u8  *pTestImage;
     u16 AsicID;
-    unsigned long TestImageIndx;
-    unsigned long TestImageSz;
-    u8  TestImageEnable;
-    u8  TestImageReady;
     int ASICResetNum;
     int DspAsicReset;
-    int PktIntfErr;
     int DSPResetNum;
-    int NumIOCTLBufs;
-    int IOCTLBufLvl;
     int DeviceCreated;
     int CardReady;
     int NetDevRegDone;
@@ -517,8 +507,6 @@ struct ft1000_info {
     struct ft1000_debug_dirs nodes;
     int registered;
     int mediastate;
-    int dhcpflg;
-    u16 packetseqnum;
     u8 squeseqnum;                 // sequence number on slow queue
     spinlock_t dpram_lock;
     spinlock_t fifo_lock;
@@ -534,7 +522,6 @@ struct ft1000_info {
     u8 RfCalVer[CALVERSZ];
     u8 RfCalDate[CALDATESZ];
     u16 DSP_TIME[4];
-    u16 ProgSnr;
     u16 LedStat;	//mbelian
     u16 ConStat;	//mbelian
     u16 ProgConStat;