diff options
author | sensoray-dev <linux-dev@sensoray.com> | 2011-10-25 18:43:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-07 09:00:10 -0500 |
commit | 57437c1da54e5cf7d536d72d61e77ebeb528a87d (patch) | |
tree | 41e024ca4bc355eee53869ef5dce593355c0ada0 /drivers/media/video/bt8xx/bttv-cards.c | |
parent | a61f96bc3abccc8b41e422da8e808eb685527305 (diff) |
[media] bttv: adding Sensoray 611 board to driver
commit affebd4db94b459f676a14d9bb696c3c2b73643d
[media] bttv: adding Sensoray 611 board to bttv driver
Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-cards.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 5939021d8eba..076b7f216538 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -284,7 +284,8 @@ static struct CARD { | |||
284 | { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" }, | 284 | { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" }, |
285 | { 0x217d6606, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, | 285 | { 0x217d6606, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, |
286 | { 0xfff6f6ff, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, | 286 | { 0xfff6f6ff, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, |
287 | { 0x03116000, BTTV_BOARD_SENSORAY311, "Sensoray 311" }, | 287 | { 0x03116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 311" }, |
288 | { 0x06116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 611" }, | ||
288 | { 0x00790e11, BTTV_BOARD_WINDVR, "Canopus WinDVR PCI" }, | 289 | { 0x00790e11, BTTV_BOARD_WINDVR, "Canopus WinDVR PCI" }, |
289 | { 0xa0fca1a0, BTTV_BOARD_ZOLTRIX, "Face to Face Tvmax" }, | 290 | { 0xa0fca1a0, BTTV_BOARD_ZOLTRIX, "Face to Face Tvmax" }, |
290 | { 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" }, | 291 | { 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" }, |
@@ -1526,10 +1527,10 @@ struct tvcard bttv_tvcards[] = { | |||
1526 | GPIO20,22,23: R30,R29,R28 | 1527 | GPIO20,22,23: R30,R29,R28 |
1527 | */ | 1528 | */ |
1528 | }, | 1529 | }, |
1529 | [BTTV_BOARD_SENSORAY311] = { | 1530 | [BTTV_BOARD_SENSORAY311_611] = { |
1530 | /* Clay Kunz <ckunz@mail.arc.nasa.gov> */ | 1531 | /* Clay Kunz <ckunz@mail.arc.nasa.gov> */ |
1531 | /* you must jumper JP5 for the card to work */ | 1532 | /* you must jumper JP5 for the 311 card (PC/104+) to work */ |
1532 | .name = "Sensoray 311", | 1533 | .name = "Sensoray 311/611", |
1533 | .video_inputs = 5, | 1534 | .video_inputs = 5, |
1534 | /* .audio_inputs= 0, */ | 1535 | /* .audio_inputs= 0, */ |
1535 | .svhs = 4, | 1536 | .svhs = 4, |