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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx23885
/
cx23885-input.c
diff --git
a/drivers/media/video/cx23885/cx23885-input.c
b/drivers/media/video/cx23885/cx23885-input.c
index
199b996
..
e97cafd
100644
(file)
--- a/
drivers/media/video/cx23885/cx23885-input.c
+++ b/
drivers/media/video/cx23885/cx23885-input.c
@@
-264,7
+264,7
@@
int cx23885_input_init(struct cx23885_dev *dev)
driver_type = RC_DRIVER_IR_RAW;
allowed_protos = RC_TYPE_ALL;
/* The grey Hauppauge RC-5 remote */
- rc_map = RC_MAP_
RC5_HAUPPAUGE_NEW
;
+ rc_map = RC_MAP_
HAUPPAUGE
;
break;
case CX23885_BOARD_TEVII_S470:
/* Integrated CX23885 IR controller */