summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 11:09:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-14 17:18:50 -0300
commit8304be888c55b501b93907177e683db62d4000c0 (patch)
treed4e2cc0357cfe4e939967cb7087348982aaa1315
parent2ccdd9a59b3a1ff3bd1be6390c4b1989a008e61c (diff)
downloadlinux-8304be888c55b501b93907177e683db62d4000c0.tar.gz
linux-8304be888c55b501b93907177e683db62d4000c0.tar.bz2
linux-8304be888c55b501b93907177e683db62d4000c0.zip
[media] cx23885: Allow the audio mux config to be specified on a per input basis
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx23885/cx23885.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 670281af3361..2978e97ee039 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -192,6 +192,7 @@ struct cx23885_buffer {
struct cx23885_input {
enum cx23885_itype type;
unsigned int vmux;
+ unsigned int amux;
u32 gpio0, gpio1, gpio2, gpio3;
};