Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 5e96d7a430be..557c676ab7dc 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -3,6 +3,8 @@
 
 #include <media/ir-common.h>
 
+#define DEFAULT_POLLING_INTERVAL        100     /* ms */
+
 struct IR_i2c;
 
 struct IR_i2c {
@@ -15,6 +17,8 @@ struct IR_i2c {
         /* Used to avoid fast repeating */
         unsigned char          old;
 
+        u32                    polling_interval; /* in ms */
+
         struct delayed_work    work;
         char                   name[32];
         char                   phys[32];
@@ -24,7 +28,6 @@ struct IR_i2c {
 enum ir_kbd_get_key_fn {
         IR_KBD_GET_KEY_CUSTOM = 0,
         IR_KBD_GET_KEY_PIXELVIEW,
-        IR_KBD_GET_KEY_PV951,
         IR_KBD_GET_KEY_HAUP,
         IR_KBD_GET_KEY_KNC1,
         IR_KBD_GET_KEY_FUSIONHDTV,
@@ -35,8 +38,9 @@ enum ir_kbd_get_key_fn {
 /* Can be passed when instantiating an ir_video i2c device */
 struct IR_i2c_init_data {
         char                    *ir_codes;
-        const char             *name;
-        u64          type; /* IR_TYPE_RC5, etc */
+        const char              *name;
+        u64                     type; /* IR_TYPE_RC5, etc */
+        u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
         /*
          * Specify either a function pointer or a value indicating one of
          * ir_kbd_i2c's internal get_key functions