aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index a2add61f7d59..0f2ba9a40d17 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -108,6 +108,7 @@
108#define EM2882_BOARD_KWORLD_ATSC_315U 69 108#define EM2882_BOARD_KWORLD_ATSC_315U 69
109#define EM2882_BOARD_EVGA_INDTUBE 70 109#define EM2882_BOARD_EVGA_INDTUBE 70
110#define EM2820_BOARD_SILVERCREST_WEBCAM 71 110#define EM2820_BOARD_SILVERCREST_WEBCAM 71
111#define EM2861_BOARD_GADMEI_UTV330PLUS 72
111 112
112/* Limits minimum and default number of buffers */ 113/* Limits minimum and default number of buffers */
113#define EM28XX_MIN_BUF 4 114#define EM28XX_MIN_BUF 4
@@ -398,6 +399,7 @@ struct em28xx_board {
398 unsigned int has_snapshot_button:1; 399 unsigned int has_snapshot_button:1;
399 unsigned int is_webcam:1; 400 unsigned int is_webcam:1;
400 unsigned int valid:1; 401 unsigned int valid:1;
402 unsigned int has_ir_i2c:1;
401 403
402 unsigned char xclk, i2c_speed; 404 unsigned char xclk, i2c_speed;
403 unsigned char radio_addr; 405 unsigned char radio_addr;
@@ -408,7 +410,7 @@ struct em28xx_board {
408 410
409 struct em28xx_input input[MAX_EM28XX_INPUT]; 411 struct em28xx_input input[MAX_EM28XX_INPUT];
410 struct em28xx_input radio; 412 struct em28xx_input radio;
411 IR_KEYTAB_TYPE *ir_codes; 413 struct ir_scancode_table *ir_codes;
412}; 414};
413 415
414struct em28xx_eeprom { 416struct em28xx_eeprom {
@@ -595,6 +597,10 @@ struct em28xx {
595 struct delayed_work sbutton_query_work; 597 struct delayed_work sbutton_query_work;
596 598
597 struct em28xx_dvb *dvb; 599 struct em28xx_dvb *dvb;
600
601 /* I2C keyboard data */
602 struct i2c_board_info info;
603 struct IR_i2c_init_data init_data;
598}; 604};
599 605
600struct em28xx_ops { 606struct em28xx_ops {