summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-11 08:15:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-11 08:15:48 -0300
commit8f93baf8768c71f00ff06b8b818c7ba04fa663f6 (patch)
tree0d11848f074a035fce804eb076b5c4915cd8ca0f /linux/include
parentf1ecc598eb4d5dcf96c771908ff51c48e734dde8 (diff)
parent0bf47672d2ce934563d0287172c9dbf911e8a3b3 (diff)
downloadmediapointer-dvb-s2-8f93baf8768c71f00ff06b8b818c7ba04fa663f6.tar.gz
mediapointer-dvb-s2-8f93baf8768c71f00ff06b8b818c7ba04fa663f6.tar.bz2
backout changeset
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/ir-kbd-i2c.h3
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*);
};