diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-01 20:52:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:01:54 -0500 |
commit | 7d070e26a868bd72f0d32189e0f3ceba47d2db82 (patch) | |
tree | 3ad5576cfd76c62634e35bb177cc29f17fbd55c5 /drivers/media/video/em28xx/em28xx-cards.c | |
parent | ab0b9fc67c2370e813ccd5d83bca8db320e67eeb (diff) |
V4L/DVB (6519): Fix HVR900/HVR950 entry
- Television is now default;
- Add HVR950 name at the entry.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index b56e0a70d8f8..9a6a4541e3c7 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -158,7 +158,7 @@ struct em28xx_board em28xx_boards[] = { | |||
158 | }}, | 158 | }}, |
159 | }, | 159 | }, |
160 | [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { | 160 | [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { |
161 | .name = "Hauppauge WinTV HVR 900", | 161 | .name = "Hauppauge WinTV HVR 900/950", |
162 | .vchannels = 3, | 162 | .vchannels = 3, |
163 | .norm = VIDEO_MODE_PAL, | 163 | .norm = VIDEO_MODE_PAL, |
164 | .tda9887_conf = TDA9887_PRESENT, | 164 | .tda9887_conf = TDA9887_PRESENT, |
@@ -166,14 +166,14 @@ struct em28xx_board em28xx_boards[] = { | |||
166 | .has_tuner = 1, | 166 | .has_tuner = 1, |
167 | .decoder = EM28XX_TVP5150, | 167 | .decoder = EM28XX_TVP5150, |
168 | .input = {{ | 168 | .input = {{ |
169 | .type = EM28XX_VMUX_COMPOSITE1, | ||
170 | .vmux = TVP5150_COMPOSITE1, | ||
171 | .amux = 1, | ||
172 | },{ | ||
173 | .type = EM28XX_VMUX_TELEVISION, | 169 | .type = EM28XX_VMUX_TELEVISION, |
174 | .vmux = TVP5150_COMPOSITE0, | 170 | .vmux = TVP5150_COMPOSITE0, |
175 | .amux = 0, | 171 | .amux = 0, |
176 | },{ | 172 | },{ |
173 | .type = EM28XX_VMUX_COMPOSITE1, | ||
174 | .vmux = TVP5150_COMPOSITE1, | ||
175 | .amux = 1, | ||
176 | },{ | ||
177 | .type = EM28XX_VMUX_SVIDEO, | 177 | .type = EM28XX_VMUX_SVIDEO, |
178 | .vmux = TVP5150_SVIDEO, | 178 | .vmux = TVP5150_SVIDEO, |
179 | .amux = 1, | 179 | .amux = 1, |