summaryrefslogtreecommitdiff
path: root/linux/include/media/ir-kbd-i2c.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media/ir-kbd-i2c.h')
-rw-r--r--linux/include/media/ir-kbd-i2c.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h
index 07963d705..93a6c933b 100644
--- a/linux/include/media/ir-kbd-i2c.h
+++ b/linux/include/media/ir-kbd-i2c.h
@@ -7,7 +7,11 @@ struct IR_i2c;
struct IR_i2c {
IR_KEYTAB_TYPE *ir_codes;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
struct i2c_client c;
+#else
+ struct i2c_client *c;
+#endif
struct input_dev *input;
struct ir_input_state ir;
@@ -15,7 +19,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