[media] cx231xx: Fix i2c support at cx231xx-input

[linux-beck.git] / drivers / media / video / cx231xx / cx231xx.h

diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index c439e778c4b11ed15f77f36750e4221a892da3cf..fcccc9d2a08e5090cdc615a1857d33cf6ea2fb3e 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -602,25 +602,6 @@ struct cx231xx_tsport {
        void                       *port_priv;
 };
 
-struct cx231xx_ir_t {
-       struct input_dev *input_dev;
-       char name[40];
-       char phys[32];
-
-#if 0  
-       /*
-        * Due to a Kconfig change, cx231xx-input is not being compiled.
-        * This structure disappeared, but other fixes are also needed.
-        * So, as a workaround, let's just comment this struct and let a
-        * latter patch fix it.
-        */
-       struct ir_dev_props props;
-#endif
-
-       /* I2C keyboard data */
-       struct IR_i2c_init_data    init_data;
-};
-
 /* main device struct */
 struct cx231xx {
        /* generic device properties */
@@ -631,7 +612,7 @@ struct cx231xx {
        struct cx231xx_board board;
 
        /* For I2C IR support */
-       struct cx231xx_ir_t ir;
+       struct IR_i2c_init_data    init_data;
 
        unsigned int stream_on:1;       /* Locks streams */
        unsigned int vbi_stream_on:1;   /* Locks streams for VBI */