diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:02:45 +0200 |
commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/media/dvb/ttpci/av7110.h | |
parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110.h')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h index e494e04eeee..55f23ddcb99 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/dvb/ttpci/av7110.h @@ -188,7 +188,6 @@ struct av7110 { struct dvb_net dvb_net1; spinlock_t feedlock1; int feeding1; - u8 tsf; u32 ttbp; unsigned char *grabbing; struct saa7146_pgtable pt; |