git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[sfrench/cifs-2.6.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 bc08bc0b723c03045962b39790333bc4d5d9a69e..ba991aa21aff4c38f66661ca94ab8adcf0799984 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
*/
-struct
dvb_usb_rc_key
ir_codes_dibusb_table[] = {
+struct
ir_scancode
ir_codes_dibusb_table[] = {
/* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
{ 0x0016, KEY_POWER },
{ 0x0010, KEY_MUTE },