diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 09:13:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 09:13:15 -0300 |
| commit | f6495a8c62646591f7785527b923544dfddc7019 (patch) | |
| tree | 297ca776a6d5b8c8ded83c29d491af6ef3e5295a /linux/include/media | |
| parent | ff417333f92b9ebf9523167136785d69bb73fab6 (diff) | |
| parent | 8e9cc981e8c7b756ee8da597dbd9861e86f53cbf (diff) | |
| download | mediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.gz mediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.bz2 | |
merge: http://kernellabs.com/hg/~stoth/tda10048-merge
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 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index 07963d705..3ad4ed540 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -7,7 +7,7 @@ struct IR_i2c; struct IR_i2c { IR_KEYTAB_TYPE *ir_codes; - struct i2c_client c; + struct i2c_client *c; struct input_dev *input; struct ir_input_state ir; @@ -15,7 +15,15 @@ struct IR_i2c { unsigned char old; struct delayed_work work; + char name[32]; char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); }; + +/* Can be passed when instantiating an ir_video i2c device */ +struct IR_i2c_init_data { + IR_KEYTAB_TYPE *ir_codes; + const char *name; + int (*get_key)(struct IR_i2c*, u32*, u32*); +}; #endif |