From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 10 Oct 2011 14:09:56 +0000 (-0300)
Subject: [media] cx23885: Allow the audio mux config to be specified on a per input basis
X-Git-Tag: next-20111101~96^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8304be888c55b501b93907177e683db62d4000c0;p=karo-tx-linux.git

[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>
---

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;
 };