Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7d070e26a868bd72f0d32189e0f3ceba47d2db82
Commit: 7d070e26a868bd72f0d32189e0f3ceba47d2db82
Parent: ab0b9fc67c2370e813ccd5d83bca8db320e67eeb
Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 1 21:52:58 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:01:54 2008 -0200
V4L/DVB (6519): Fix HVR900/HVR950 entry
- Television is now default;
- Add HVR950 name at the entry.
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
Documentation/video4linux/CARDLIST.em28xx | 2 +-
drivers/media/video/em28xx/em28xx-cards.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.em28xx
b/Documentation/video4linux/CARDLIST.em28xx
index 37f0e3c..abdcc68 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -8,7 +8,7 @@
7 -> Leadtek Winfast USB II (em2800)
8 -> Kworld USB2800 (em2800)
9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207]
- 10 -> Hauppauge WinTV HVR 900 (em2880)
+ 10 -> Hauppauge WinTV HVR 900/950 (em2880)
11 -> Terratec Hybrid XS (em2880)
12 -> Kworld PVR TV 2800 RF (em2820/em2840)
13 -> Terratec Prodigy XS (em2880)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c
b/drivers/media/video/em28xx/em28xx-cards.c
index b56e0a7..9a6a454 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[] = {
}},
},
[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
- .name = "Hauppauge WinTV HVR 900",
+ .name = "Hauppauge WinTV HVR 900/950",
.vchannels = 3,
.norm = VIDEO_MODE_PAL,
.tda9887_conf = TDA9887_PRESENT,
@@ -166,14 +166,14 @@ struct em28xx_board em28xx_boards[] = {
.has_tuner = 1,
.decoder = EM28XX_TVP5150,
.input = {{
- .type = EM28XX_VMUX_COMPOSITE1,
- .vmux = TVP5150_COMPOSITE1,
- .amux = 1,
- },{
.type = EM28XX_VMUX_TELEVISION,
.vmux = TVP5150_COMPOSITE0,
.amux = 0,
},{
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = TVP5150_COMPOSITE1,
+ .amux = 1,
+ },{
.type = EM28XX_VMUX_SVIDEO,
.vmux = TVP5150_SVIDEO,
.amux = 1,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
