Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317996
b: refs/heads/master
c: 03b3ac1
h: refs/heads/master
v: v3
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent 44c17ed commit 68b3973
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 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: 586288c957cb17bf0fe00bf91f793c786f995946
refs/heads/master: 03b3ac18cf5ee05c821a1e54d1ddd4e713f08343
8 changes: 3 additions & 5 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef _FT1000_USB_H_
#define _FT1000_USB_H_

/*Jim*/
#include "../ft1000.h"
#include "ft1000_ioctl.h"
#define FT1000_DRV_VER 0x01010403
Expand All @@ -27,7 +26,6 @@ struct app_info_block {
struct list_head app_sqlist; // link list of msgs for applicaton on slow queue
} __attribute__((packed));

/*end of Jim*/
#define DEBUG(args...) printk(KERN_INFO args)

#define FALSE 0
Expand Down Expand Up @@ -121,8 +119,8 @@ struct ft1000_info {
u8 RfCalVer[CALVERSZ];
u8 RfCalDate[CALDATESZ];
u16 DSP_TIME[4];
u16 LedStat; //mbelian
u16 ConStat; //mbelian
u16 LedStat;
u16 ConStat;
u16 ProgConStat;
struct list_head prov_list;
int appcnt;
Expand All @@ -137,7 +135,7 @@ struct ft1000_info {
} DSPSess;
unsigned short tempbuf[32];
char netdevname[IFNAMSIZ];
struct proc_dir_entry *ft1000_proc_dir; //mbelian
struct proc_dir_entry *ft1000_proc_dir;
};


Expand Down

0 comments on commit 68b3973

Please sign in to comment.