diff options
author | Sascha Sommer <saschasommer@freenet.de> | 2005-11-09 00:37:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:19 -0500 |
commit | 16f2e6229f6f7b89cb42f4942cb46dc645faae2a (patch) | |
tree | 798d8cbe6e7362f5967203a3dc1cf6db244d9834 /drivers/media | |
parent | 4f9c05aa727a3b27e28972f2f3938b29ad81b833 (diff) |
[PATCH] v4l: 793: remotes for the cinergy 200 usb and cinergy 250 usb are the same
- Remotes for the Cinergy 200 USB and Cinergy 250 USB are the same.
Signed-off-by: Sascha Sommer <saschasommer@freenet.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 0576ad6c42b7..ba367a9796e7 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
@@ -150,6 +150,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) | |||
150 | break; | 150 | break; |
151 | case (EM2820_BOARD_UNKNOWN): | 151 | case (EM2820_BOARD_UNKNOWN): |
152 | break; | 152 | break; |
153 | case (EM2800_BOARD_TERRATEC_CINERGY_200): | ||
153 | case (EM2820_BOARD_TERRATEC_CINERGY_250): | 154 | case (EM2820_BOARD_TERRATEC_CINERGY_250): |
154 | ir->ir_codes = ir_codes_em_terratec; | 155 | ir->ir_codes = ir_codes_em_terratec; |
155 | ir->get_key = get_key_terratec; | 156 | ir->get_key = get_key_terratec; |
@@ -164,8 +165,6 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) | |||
164 | break; | 165 | break; |
165 | case (EM2820_BOARD_MSI_VOX_USB_2): | 166 | case (EM2820_BOARD_MSI_VOX_USB_2): |
166 | break; | 167 | break; |
167 | case (EM2800_BOARD_TERRATEC_CINERGY_200): | ||
168 | break; | ||
169 | case (EM2800_BOARD_LEADTEK_WINFAST_USBII): | 168 | case (EM2800_BOARD_LEADTEK_WINFAST_USBII): |
170 | break; | 169 | break; |
171 | case (EM2800_BOARD_KWORLD_USB2800): | 170 | case (EM2800_BOARD_KWORLD_USB2800): |