From d10081a306ba46c10080c94bcfad20db154f8af5 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 29 Apr 2011 07:41:09 +0200
Subject: [PATCH] --- yaml --- r: 249263 b: refs/heads/master c:
 2989b19ff838f3863cc1c32b288fce86cf639b3c h: refs/heads/master i:   249261:
 6096d2bfc58125508c95e36c3eaff768337a63c0   249259:
 1ef25b275a80e96a9fe5e1cdca93f0e5d1e3e78b   249255:
 6d3c3c774e7453b7ceca929bc2c08840fd379ce7   249247:
 0d1a4d3913a26426a71ce895eaf2502137e05dfc v: v3

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

diff --git a/[refs] b/[refs]
index 97dc5f6076d6..041692575d9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d20634100d9ae74d38dac70d012f2e7af4e7558
+refs/heads/master: 2989b19ff838f3863cc1c32b288fce86cf639b3c
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index b4b4f1d23ce1..1e5c75091893 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -749,7 +749,6 @@ int init_ft1000_netdev(struct ft1000_device *ft1000dev)
 	pInfo->mediastate = 0;
 	pInfo->fifo_cnt = 0;
 	pInfo->DeviceCreated = FALSE;
-	pInfo->CurrentInterruptEnableMask = ISR_DEFAULT_MASK;
 	pInfo->InterruptsEnabled = FALSE;
 	pInfo->CardReady = 0;
 	pInfo->DSP_TIME[0] = 0;
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index ee47d4c18af2..69576cd85ab1 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -508,7 +508,6 @@ struct ft1000_info {
     u8 squeseqnum;                 // sequence number on slow queue
     spinlock_t dpram_lock;
     spinlock_t fifo_lock;
-    u16 CurrentInterruptEnableMask;
     int InterruptsEnabled;
     u16 fifo_cnt;
     u8 DspVer[DSPVERSZ];        // DSP version number