diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 21:01:27 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 21:01:27 -0200 |
commit | d04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (patch) | |
tree | 1bf8070b7cff7a5f1375a141c51edcd92e3e3c6a /drivers/media/video/saa7134/saa7134-cards.c | |
parent | f1dccedc8148026d9071c6805f7cb77374a9e56f (diff) | |
parent | e0ad8486266c3415ab9c17f5c03c47edc7b93d7b (diff) |
Merge branch 'work'
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 275d06af69d..c64718aec9c 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c @@ -2515,6 +2515,7 @@ struct saa7134_board saa7134_boards[] = { .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .mpeg = SAA7134_MPEG_DVB, + .gpiomask = 1 << 21, .inputs = {{ .name = name_tv, .vmux = 1, @@ -2529,6 +2530,11 @@ struct saa7134_board saa7134_boards[] = { .vmux = 8, .amux = LINE1, }}, + .radio = { + .name = name_radio, + .amux = TV, + .gpio = 0x0200000, + }, }, [SAA7134_BOARD_MSI_TVATANYWHERE_PLUS] = { .name = "MSI TV@Anywhere plus", |