git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
em28xx-input.c
diff --git
a/drivers/media/video/em28xx/em28xx-input.c
b/drivers/media/video/em28xx/em28xx-input.c
index
31e89e4
..
3ffb568
100644
(file)
--- a/
drivers/media/video/em28xx/em28xx-input.c
+++ b/
drivers/media/video/em28xx/em28xx-input.c
@@
-3,7
+3,7
@@
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
- Mauro Carvalho Chehab <mchehab@
brturbo.com.br
>
+ Mauro Carvalho Chehab <mchehab@
infradead.org
>
Sascha Sommer <saschasommer@freenet.de>
This program is free software; you can redistribute it and/or modify
Sascha Sommer <saschasommer@freenet.de>
This program is free software; you can redistribute it and/or modify
@@
-105,7
+105,7
@@
static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
return 1;
}
return 1;
}
-static int get_key_pinnacle_usb(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_pinnacle_usb
_grey
(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{
unsigned char buf[3];
{
unsigned char buf[3];
@@
-148,8
+148,8
@@
void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
break;
case (EM2820_BOARD_PINNACLE_USB_2):
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
break;
case (EM2820_BOARD_PINNACLE_USB_2):
- ir->ir_codes = ir_codes_
em_pinnacle_usb
;
- ir->get_key = get_key_pinnacle_usb;
+ ir->ir_codes = ir_codes_
pinnacle_grey
;
+ ir->get_key = get_key_pinnacle_usb
_grey
;
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Pinnacle PCTV)");
break;
case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Pinnacle PCTV)");
break;
case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):