summaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2010-11-20 02:42:57 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 13:16:54 +0300
commit7c8352d18ddbe37cff8ad71175a11739662ef899 (patch)
treecf55e462816bb638fd3f665bf5c68a54964347c3 /drivers/media/video/saa7134/saa7134.h
parent651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9 (diff)
downloadlinux-7c8352d18ddbe37cff8ad71175a11739662ef899.tar.xz
[media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end
Both timers are used for a similar purpose. Merging them allows for some minor simplifications. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index f93951acec41..babfbe7543eb 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -134,7 +134,6 @@ struct saa7134_card_ir {
bool active;
struct timer_list timer;
- struct timer_list timer_end; /* timer_end for code completion */
/* IR core raw decoding */
u32 raw_decode;