diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/media/ir-kbd-i2c.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/media/ir-kbd-i2c.h')
| -rw-r--r-- | include/media/ir-kbd-i2c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h index 00fa57eb9fde..07963d705400 100644 --- a/include/media/ir-kbd-i2c.h +++ b/include/media/ir-kbd-i2c.h | |||
| @@ -14,8 +14,7 @@ struct IR_i2c { | |||
| 14 | /* Used to avoid fast repeating */ | 14 | /* Used to avoid fast repeating */ |
| 15 | unsigned char old; | 15 | unsigned char old; |
| 16 | 16 | ||
| 17 | struct work_struct work; | 17 | struct delayed_work work; |
| 18 | struct timer_list timer; | ||
| 19 | char phys[32]; | 18 | char phys[32]; |
| 20 | int (*get_key)(struct IR_i2c*, u32*, u32*); | 19 | int (*get_key)(struct IR_i2c*, u32*, u32*); |
| 21 | }; | 20 | }; |