diff options
author | Markus Rechberger <mrechberger@gmail.com> | 2005-11-09 00:38:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:23 -0500 |
commit | 08eca13dc407c389f04ce295144bb3fcd996a10d (patch) | |
tree | 5641a340debffad85f0f82bef480bc413c26dd3e /drivers/media/video/em28xx/em28xx-cards.c | |
parent | fe2e36c8cdc81bea8edf7d0408a1f49da01e16ee (diff) |
[PATCH] v4l: 838: modified settings for msi vox usb 2.0
- Modified settings for MSI VOX USB 2.0
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
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/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index e6dd6eaa8d68..27db6d956c3f 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -140,7 +140,7 @@ struct em2820_board em2820_boards[] = { | |||
140 | .name = "MSI VOX USB 2.0", | 140 | .name = "MSI VOX USB 2.0", |
141 | .vchannels = 3, | 141 | .vchannels = 3, |
142 | .norm = VIDEO_MODE_PAL, | 142 | .norm = VIDEO_MODE_PAL, |
143 | .tuner_type = TUNER_PHILIPS_PAL, | 143 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
144 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, | 144 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, |
145 | .has_tuner = 1, | 145 | .has_tuner = 1, |
146 | .decoder = EM2820_SAA7114, | 146 | .decoder = EM2820_SAA7114, |
@@ -233,7 +233,7 @@ const unsigned int em2820_bcount = ARRAY_SIZE(em2820_boards); | |||
233 | /* table of devices that work with this driver */ | 233 | /* table of devices that work with this driver */ |
234 | struct usb_device_id em2820_id_table [] = { | 234 | struct usb_device_id em2820_id_table [] = { |
235 | { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, | 235 | { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, |
236 | { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_UNKNOWN }, | 236 | { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 }, |
237 | { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, | 237 | { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, |
238 | { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, | 238 | { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, |
239 | { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, | 239 | { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, |