diff options
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
-rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index ed94b17dd8a5..62e41ab65810 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <media/tveeprom.h> | 30 | #include <media/tveeprom.h> |
31 | #include <media/videobuf-dma-sg.h> | 31 | #include <media/videobuf-dma-sg.h> |
32 | #include <media/videobuf-dvb.h> | 32 | #include <media/videobuf-dvb.h> |
33 | #include <media/ir-core.h> | 33 | #include <media/rc-core.h> |
34 | 34 | ||
35 | #include "btcx-risc.h" | 35 | #include "btcx-risc.h" |
36 | #include "cx23885-reg.h" | 36 | #include "cx23885-reg.h" |
@@ -84,6 +84,7 @@ | |||
84 | #define CX23885_BOARD_HAUPPAUGE_HVR1290 26 | 84 | #define CX23885_BOARD_HAUPPAUGE_HVR1290 26 |
85 | #define CX23885_BOARD_MYGICA_X8558PRO 27 | 85 | #define CX23885_BOARD_MYGICA_X8558PRO 27 |
86 | #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28 | 86 | #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28 |
87 | #define CX23885_BOARD_GOTVIEW_X5_3D_HYBRID 29 | ||
87 | 88 | ||
88 | #define GPIO_0 0x00000001 | 89 | #define GPIO_0 0x00000001 |
89 | #define GPIO_1 0x00000002 | 90 | #define GPIO_1 0x00000002 |
@@ -310,8 +311,7 @@ struct cx23885_kernel_ir { | |||
310 | char *name; | 311 | char *name; |
311 | char *phys; | 312 | char *phys; |
312 | 313 | ||
313 | struct input_dev *inp_dev; | 314 | struct rc_dev *rc; |
314 | struct ir_dev_props props; | ||
315 | }; | 315 | }; |
316 | 316 | ||
317 | struct cx23885_dev { | 317 | struct cx23885_dev { |