Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...

[pandora-kernel.git] / drivers / media / video / bt8xx / bttv-input.c

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index e8b64bc..677d70c 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -193,12 +193,10 @@ static void bttv_rc5_timer_end(unsigned long data)
 {
        struct bttv_ir *ir = (struct bttv_ir *)data;
        struct timeval tv;
-       unsigned long current_jiffies;
        u32 gap;
        u32 rc5 = 0;
 
        /* get time */
-       current_jiffies = jiffies;
        do_gettimeofday(&tv);
 
        /* avoid overflow with gap >1s */