aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.bttv2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index b72706c58a44..b8dde0fb9be7 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -87,7 +87,7 @@
87 86 -> Osprey 101/151 w/ svid 87 86 -> Osprey 101/151 w/ svid
88 87 -> Osprey 200/201/250/251 88 87 -> Osprey 200/201/250/251
89 88 -> Osprey 200/250 [0070:ff01] 89 88 -> Osprey 200/250 [0070:ff01]
90 89 -> Osprey 210/220 90 89 -> Osprey 210/220/230
91 90 -> Osprey 500 [0070:ff02] 91 90 -> Osprey 500 [0070:ff02]
92 91 -> Osprey 540 [0070:ff04] 92 91 -> Osprey 540 [0070:ff04]
93 92 -> Osprey 2000 [0070:ff03] 93 92 -> Osprey 2000 [0070:ff03]
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index e358e91143d7..671f92b1df18 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -1903,7 +1903,7 @@ struct tvcard bttv_tvcards[] = {
1903 .no_tda7432 = 1, 1903 .no_tda7432 = 1,
1904 }, 1904 },
1905 [BTTV_BOARD_OSPREY2x0] = { 1905 [BTTV_BOARD_OSPREY2x0] = {
1906 .name = "Osprey 210/220", /* 0x1(A|B)-04C0-C1 */ 1906 .name = "Osprey 210/220/230", /* 0x1(A|B)-04C0-C1 */
1907 .video_inputs = 2, 1907 .video_inputs = 2,
1908 .audio_inputs = 1, 1908 .audio_inputs = 1,
1909 .tuner = -1, 1909 .tuner = -1,
@@ -3790,6 +3790,7 @@ static void __devinit osprey_eeprom(struct bttv *btv)
3790 break; 3790 break;
3791 case 0x0060: 3791 case 0x0060:
3792 case 0x0070: 3792 case 0x0070:
3793 case 0x00A0:
3793 btv->c.type = BTTV_BOARD_OSPREY2x0; 3794 btv->c.type = BTTV_BOARD_OSPREY2x0;
3794 /* enable output on select control lines */ 3795 /* enable output on select control lines */
3795 gpio_inout(0xffffff,0x000303); 3796 gpio_inout(0xffffff,0x000303);