Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / media / ir-kbd-i2c.h

diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 00fa57e..07963d7 100644 (file)
--- a/include/media/ir-kbd-i2c.h
+++ b/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*);
 };