Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / saa7134 / saa7134.h

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index d3b6a196e5dce143ee4a5ae68a991353c9392ec6..5b0a347b0b8f1ac0cf5e8927506d8747e83cfb84 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -37,7 +37,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/tuner.h>
-#include <media/ir-common.h>
+#include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/videobuf-dma-sg.h>
 #include <sound/core.h>
@@ -119,6 +119,26 @@ struct saa7134_format {
        unsigned int   uvswap:1;
 };
 
+struct saa7134_card_ir {
+       struct rc_dev           *dev;
+
+       char                    name[32];
+       char                    phys[32];
+       unsigned                users;
+
+       u32                     polling;
+        u32                    last_gpio;
+        u32                    mask_keycode, mask_keydown, mask_keyup;
+
+       bool                    running;
+       bool                    active;
+
+       struct timer_list       timer;
+
+       /* IR core raw decoding */
+       u32                     raw_decode;
+};
+
 /* ----------------------------------------------------------- */
 /* card configuration                                          */
 
@@ -305,6 +325,8 @@ struct saa7134_format {
 #define SAA7134_BOARD_BEHOLD_A7             179
 #define SAA7134_BOARD_AVERMEDIA_M733A       180
 #define SAA7134_BOARD_TECHNOTREND_BUDGET_T3000 181
+#define SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG 182
+#define SAA7134_BOARD_VIDEOMATE_M1F         183
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
@@ -529,7 +551,7 @@ struct saa7134_dev {
 
        /* infrared remote */
        int                        has_remote;
-       struct card_ir             *remote;
+       struct saa7134_card_ir     *remote;
 
        /* pci i/o */
        char                       name[32];