diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-28 00:46:35 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-28 00:46:35 -0400 |
| commit | 3549c2c092a447c2c5bf1269f21b858acc4babdc (patch) | |
| tree | f3882cd99bd81459d53145a57ca352a861e732a6 /linux | |
| parent | 0c7c252f2572d6608b196a595a68de58c35208da (diff) | |
| parent | 6f84e5500eb3765a5b91a4ce81b48528273a2133 (diff) | |
| download | mediapointer-dvb-s2-3549c2c092a447c2c5bf1269f21b858acc4babdc.tar.gz mediapointer-dvb-s2-3549c2c092a447c2c5bf1269f21b858acc4babdc.tar.bz2 | |
merge: from http://linuxtv.org/hg/~mkrufky/osprey
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index b72706c58..b8dde0fb9 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -87,7 +87,7 @@ 86 -> Osprey 101/151 w/ svid 87 -> Osprey 200/201/250/251 88 -> Osprey 200/250 [0070:ff01] - 89 -> Osprey 210/220 + 89 -> Osprey 210/220/230 90 -> Osprey 500 [0070:ff02] 91 -> Osprey 540 [0070:ff04] 92 -> Osprey 2000 [0070:ff03] diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 909084515..8dab6b9b1 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -1926,7 +1926,7 @@ struct tvcard bttv_tvcards[] = { .no_tda7432 = 1, }, [BTTV_BOARD_OSPREY2x0] = { - .name = "Osprey 210/220", /* 0x1(A|B)-04C0-C1 */ + .name = "Osprey 210/220/230", /* 0x1(A|B)-04C0-C1 */ .video_inputs = 2, .audio_inputs = 1, .tuner = -1, @@ -3826,6 +3826,7 @@ static void __devinit osprey_eeprom(struct bttv *btv) break; case 0x0060: case 0x0070: + case 0x00A0: btv->c.type = BTTV_BOARD_OSPREY2x0; /* enable output on select control lines */ gpio_inout(0xffffff,0x000303); |