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
/
dibusb-common.c
diff --git
a/drivers/media/dvb/dvb-usb/dibusb-common.c
b/drivers/media/dvb/dvb-usb/dibusb-common.c
index
9143b56
..
bc08bc0
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/
drivers/media/dvb/dvb-usb/dibusb-common.c
@@
-327,7
+327,7
@@
EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
/*
* common remote control stuff
*/
/*
* common remote control stuff
*/
-struct dvb_usb_rc_key
dibusb_rc_keys
[] = {
+struct dvb_usb_rc_key
ir_codes_dibusb_table
[] = {
/* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
{ 0x0016, KEY_POWER },
{ 0x0010, KEY_MUTE },
/* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
{ 0x0016, KEY_POWER },
{ 0x0010, KEY_MUTE },
@@
-456,7
+456,7
@@
struct dvb_usb_rc_key dibusb_rc_keys[] = {
{ 0x804e, KEY_ENTER },
{ 0x804f, KEY_VOLUMEDOWN },
};
{ 0x804e, KEY_ENTER },
{ 0x804f, KEY_VOLUMEDOWN },
};
-EXPORT_SYMBOL(
dibusb_rc_keys
);
+EXPORT_SYMBOL(
ir_codes_dibusb_table
);
int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{