From 980172ac1ac27ee12344886630fa434bf6846596 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 10 Oct 2011 11:09:56 -0300
Subject: [PATCH] --- yaml --- r: 271967 b: refs/heads/master c:
 8304be888c55b501b93907177e683db62d4000c0 h: refs/heads/master i:   271965:
 60026693055aa219598aeabe88ae33d95f964b92   271963:
 2996e8c2001d12894661de46269589dc06cdfb9e   271959:
 15f694eb844ff1e6c899658c6c7a7913ac73affd   271951:
 65bfd6f88dc4490dbcbcdcc3ef23b05da58e26db   271935:
 ee301396e53efa3d57d1891e236dcfb6364883f7 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx23885/cx23885.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06403d790b39..6a8959690db2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ccdd9a59b3a1ff3bd1be6390c4b1989a008e61c
+refs/heads/master: 8304be888c55b501b93907177e683db62d4000c0
diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
index 670281af3361..2978e97ee039 100644
--- a/trunk/drivers/media/video/cx23885/cx23885.h
+++ b/trunk/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;
 };