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

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
  V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
  V4L/DVB: vivi and mem2mem_testdev need slab.h to build
  V4L/DVB: tm6000: bugfix image position
  V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
  V4L/DVB: tm6000: README - add vbi
  V4L/DVB: Fix unlock logic at medusa_video_init
  V4L/DVB: fix dvb frontend lockup
  V4L/DVB: s2255drv: remove dead code
  V4L/DVB: s2255drv: return if vdev not found
  V4L/DVB: ov511: cleanup: remove unneeded null check
  V4L/DVB: media/mem2mem: dereferencing free memory
  V4L/DVB: media/IR: Add missing include file to rc-map.c
  V4L/DVB: dvb/stv6110x: cleanup error handling
  V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
  V4L/DVB: ngene: start separating out DVB functions into separate file
  V4L/DVB: ngene: split out card specific code into a separate file
  V4L/DVB: ngene: split out i2c code into a separate file
  V4L/DVB: ngene: add initial support for digital side of Avermedia m780
  V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
  V4L-DVB: ngene: make sure that tuner headers are included
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index a59faa27912..036893fa448 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -99,7 +99,7 @@ static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff)
 
 /* The keymapping struct. Somehow this should be loaded to the driver, but
  * currently it is hardcoded. */
-static struct dvb_usb_rc_key vp7045_rc_keys[] = {
+static struct dvb_usb_rc_key ir_codes_vp7045_table[] = {
         { 0x0016, KEY_POWER },
         { 0x0010, KEY_MUTE },
         { 0x0003, KEY_1 },
@@ -165,10 +165,10 @@ static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                 return 0;
         }
 
-        for (i = 0; i < ARRAY_SIZE(vp7045_rc_keys); i++)
-                if (rc5_data(&vp7045_rc_keys[i]) == key) {
+        for (i = 0; i < ARRAY_SIZE(ir_codes_vp7045_table); i++)
+                if (rc5_data(&ir_codes_vp7045_table[i]) == key) {
                         *state = REMOTE_KEY_PRESSED;
-                        *event = vp7045_rc_keys[i].event;
+                        *event = ir_codes_vp7045_table[i].event;
                         break;
                 }
         return 0;
@@ -260,8 +260,8 @@ static struct dvb_usb_device_properties vp7045_properties = {
         .read_mac_address = vp7045_read_mac_addr,
 
         .rc_interval      = 400,
-        .rc_key_map       = vp7045_rc_keys,
-        .rc_key_map_size  = ARRAY_SIZE(vp7045_rc_keys),
+        .rc_key_map       = ir_codes_vp7045_table,
+        .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp7045_table),
         .rc_query         = vp7045_rc_query,
 
         .num_device_descs = 2,