diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 07:10:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 07:10:24 -0300 |
| commit | 9a09794eece0cb3e40b69aee140b81d87f914fc1 (patch) | |
| tree | ca92ed7735e27bbfa58a596f49e9378d230b77a0 /linux/include/media | |
| parent | 3c00de0d74330e4761f5592f873d1a2b7553e8b3 (diff) | |
| parent | 883dc7792c9ded24211969d851819da1b01aaca3 (diff) | |
| download | mediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.gz mediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ir-kbd-i2c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index 00fa57eb9..07963d705 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -14,8 +14,7 @@ struct IR_i2c { /* Used to avoid fast repeating */ unsigned char old; - struct work_struct work; - struct timer_list timer; + struct delayed_work work; char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); }; |