diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:10:32 -0300 |
| commit | 1cbfa6bb381bc427843d530820fb666d0ed9a310 (patch) | |
| tree | f74da7f181ead203e12e151a1a60f7eb5816dc3c /linux/drivers | |
| parent | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (diff) | |
| parent | aa74e8c588686e857f1817a82211865bf3cc28e4 (diff) | |
| download | mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.gz mediapointer-dvb-s2-1cbfa6bb381bc427843d530820fb666d0ed9a310.tar.bz2 | |
Merge from mkrufky's cx88-ivtv tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index cefc68e6c..73b7ed14f 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -325,19 +325,19 @@ struct cx88_board cx88_boards[] = { .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, - .gpio0 = 0xbff0, + .gpio0 = 0xbff0, },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, - .gpio0 = 0xbff3, + .gpio0 = 0xbff3, },{ .type = CX88_VMUX_SVIDEO, .vmux = 2, - .gpio0 = 0xbff3, + .gpio0 = 0xbff3, }}, .radio = { .type = CX88_RADIO, - .gpio0 = 0xbff0, + .gpio0 = 0xbff0, }, }, [CX88_BOARD_ASUS_PVR_416] = { |