diff options
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-input.c | 5 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-input.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c index bba356d61..e809a0028 100644 --- a/linux/drivers/media/video/em28xx/em28xx-input.c +++ b/linux/drivers/media/video/em28xx/em28xx-input.c @@ -1,5 +1,5 @@ /* - * $Id: em28xx-input.c,v 1.3 2005/10/14 21:29:04 mrechberger Exp $ + * $Id: em28xx-input.c,v 1.4 2005/10/15 09:20:35 nsh Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -152,6 +152,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_UNKNOWN): break; + case (EM2800_BOARD_TERRATEC_CINERGY_200): case (EM2820_BOARD_TERRATEC_CINERGY_250): ir->ir_codes = ir_codes_em_terratec; ir->get_key = get_key_terratec; @@ -166,8 +167,6 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_MSI_VOX_USB_2): break; - case (EM2800_BOARD_TERRATEC_CINERGY_200): - break; case (EM2800_BOARD_LEADTEK_WINFAST_USBII): break; case (EM2800_BOARD_KWORLD_USB2800): diff --git a/linux/drivers/usb/media/em2820-input.c b/linux/drivers/usb/media/em2820-input.c index 2138b4b69..3edf43f4c 100644 --- a/linux/drivers/usb/media/em2820-input.c +++ b/linux/drivers/usb/media/em2820-input.c @@ -1,5 +1,5 @@ /* - * $Id: em2820-input.c,v 1.3 2005/10/14 21:29:04 mrechberger Exp $ + * $Id: em2820-input.c,v 1.4 2005/10/15 09:20:35 nsh Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -152,6 +152,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_UNKNOWN): break; + case (EM2800_BOARD_TERRATEC_CINERGY_200): case (EM2820_BOARD_TERRATEC_CINERGY_250): ir->ir_codes = ir_codes_em_terratec; ir->get_key = get_key_terratec; @@ -166,8 +167,6 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) break; case (EM2820_BOARD_MSI_VOX_USB_2): break; - case (EM2800_BOARD_TERRATEC_CINERGY_200): - break; case (EM2800_BOARD_LEADTEK_WINFAST_USBII): break; case (EM2800_BOARD_KWORLD_USB2800): diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 09ea4d158..b89cea38f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-10-15 09:19 nshmyrev + + * ../linux/drivers/usb/media/em2820-input.c: (em2820_set_ir): + + Remotes for the Cinergy 200 USB and Cinergy 250 USB are the same. + + Signed-off-by: Sascha Sommer <saschasommer@freenet.de> + 2005-10-15 08:25 nshmyrev * ../linux/drivers/media/.cvsignore: |