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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-usb
/
dvb-usb.h
diff --git
a/drivers/media/dvb/dvb-usb/dvb-usb.h
b/drivers/media/dvb/dvb-usb/dvb-usb.h
index
76a8096
..
7d35d07
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/
drivers/media/dvb/dvb-usb/dvb-usb.h
@@
-85,7
+85,7
@@
static inline u8 rc5_data(struct rc_map_table *key)
return key->scancode & 0xff;
}
-static inline u
8
rc5_scan(struct rc_map_table *key)
+static inline u
16
rc5_scan(struct rc_map_table *key)
{
return key->scancode & 0xffff;
}