git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-usb
/
vp702x.c
diff --git
a/drivers/media/dvb/dvb-usb/vp702x.c
b/drivers/media/dvb/dvb-usb/vp702x.c
index
ef4e37d
..
4d33245
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/vp702x.c
+++ b/
drivers/media/dvb/dvb-usb/vp702x.c
@@
-174,7
+174,7
@@
static int vp702x_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
}
/* keys for the enclosed remote control */
}
/* keys for the enclosed remote control */
-static struct dvb_usb_rc_key
vp702x_rc_keys
[] = {
+static struct dvb_usb_rc_key
ir_codes_vp702x_table
[] = {
{ 0x0001, KEY_1 },
{ 0x0002, KEY_2 },
};
{ 0x0001, KEY_1 },
{ 0x0002, KEY_2 },
};
@@
-197,10
+197,10
@@
static int vp702x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
return 0;
}
return 0;
}
- for (i = 0; i < ARRAY_SIZE(
vp702x_rc_keys
); i++)
- if (rc5_custom(&
vp702x_rc_keys
[i]) == key[1]) {
+ for (i = 0; i < ARRAY_SIZE(
ir_codes_vp702x_table
); i++)
+ if (rc5_custom(&
ir_codes_vp702x_table
[i]) == key[1]) {
*state = REMOTE_KEY_PRESSED;
*state = REMOTE_KEY_PRESSED;
- *event =
vp702x_rc_keys
[i].event;
+ *event =
ir_codes_vp702x_table
[i].event;
break;
}
return 0;
break;
}
return 0;
@@
-283,8
+283,8
@@
static struct dvb_usb_device_properties vp702x_properties = {
},
.read_mac_address = vp702x_read_mac_addr,
},
.read_mac_address = vp702x_read_mac_addr,
- .rc_key_map =
vp702x_rc_keys
,
- .rc_key_map_size = ARRAY_SIZE(
vp702x_rc_keys
),
+ .rc_key_map =
ir_codes_vp702x_table
,
+ .rc_key_map_size = ARRAY_SIZE(
ir_codes_vp702x_table
),
.rc_interval = 400,
.rc_query = vp702x_rc_query,
.rc_interval = 400,
.rc_query = vp702x_rc_query,