summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-13 11:53:31 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-13 11:53:31 -0300
commit4c691e7dabc47811013c7266fa5f32fe96687c36 (patch)
treea6185d7724be9b53607ab988625fd75052b1a9b2 /linux/drivers/media/video/em28xx/em28xx.h
parent8201f56625ffdc9146ad8eb4525c1b50e6194f5a (diff)
parent4198bf24c30e208e3c1a4d833e52ee2330bdb008 (diff)
downloadmediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.gz
mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.bz2
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx.h')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 09589ccca..90e9e2fb5 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -402,6 +402,7 @@ struct em28xx_board {
unsigned int is_webcam:1;
unsigned int no_audio:1;
unsigned int valid:1;
+ unsigned int has_ir_i2c:1;
unsigned char xclk, i2c_speed;
unsigned char radio_addr;
@@ -412,7 +413,7 @@ struct em28xx_board {
struct em28xx_input input[MAX_EM28XX_INPUT];
struct em28xx_input radio;
- IR_KEYTAB_TYPE *ir_codes;
+ struct ir_scancode_table *ir_codes;
};
struct em28xx_eeprom {
@@ -621,6 +622,12 @@ struct em28xx {
struct delayed_work sbutton_query_work;
struct em28xx_dvb *dvb;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+ /* I2C keyboard data */
+ struct i2c_board_info info;
+ struct IR_i2c_init_data init_data;
+#endif
};
struct em28xx_ops {