projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 3.7-rc1 into tty-linus
[deliverable/linux.git]
/
drivers
/
media
/
pci
/
cx23885
/
cx23885-cards.c
diff --git
a/drivers/media/pci/cx23885/cx23885-cards.c
b/drivers/media/pci/cx23885/cx23885-cards.c
index 39a4a4b9ed7e893d97fe3460dcef33dc663de5b8..5acdf954ff6bcdadec1c1dfe248012f5a3bf7f84 100644
(file)
--- a/
drivers/media/pci/cx23885/cx23885-cards.c
+++ b/
drivers/media/pci/cx23885/cx23885-cards.c
@@
-542,11
+542,13
@@
struct cx23885_board cx23885_boards[] = {
{
.type = CX23885_VMUX_COMPOSITE1,
.vmux = CX25840_COMPOSITE8,
{
.type = CX23885_VMUX_COMPOSITE1,
.vmux = CX25840_COMPOSITE8,
+ .amux = CX25840_AUDIO7,
},
{
.type = CX23885_VMUX_SVIDEO,
.vmux = CX25840_SVIDEO_LUMA3 |
CX25840_SVIDEO_CHROMA4,
},
{
.type = CX23885_VMUX_SVIDEO,
.vmux = CX25840_SVIDEO_LUMA3 |
CX25840_SVIDEO_CHROMA4,
+ .amux = CX25840_AUDIO7,
},
{
.type = CX23885_VMUX_COMPONENT,
},
{
.type = CX23885_VMUX_COMPONENT,
@@
-554,6
+556,7
@@
struct cx23885_board cx23885_boards[] = {
CX25840_VIN1_CH1 |
CX25840_VIN6_CH2 |
CX25840_VIN7_CH3,
CX25840_VIN1_CH1 |
CX25840_VIN6_CH2 |
CX25840_VIN7_CH3,
+ .amux = CX25840_AUDIO7,
},
},
},
},
},
},
This page took
0.029431 seconds
and
5
git commands to generate.