Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249260
b: refs/heads/master
c: 8cfff92
h: refs/heads/master
v: v3
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 1ef25b2 commit c01a051
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb40876e436a025896aeb9c745e3cfb4f25700b2
refs/heads/master: 8cfff928a7a8bf946570adce259e80635321e82b
13 changes: 0 additions & 13 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit c01a051

Please sign in to comment.