commit 2166f0a9710413ea60bd72a4983de11b764468e4
author Frank Schaefer <fschaefer.oss@googlemail.com> Thu Mar 21 13:51:16 2013 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Sat Mar 23 11:31:13 2013 -0300
tree 919651b68c2678c145b482502ae91f73550172cd
parent 20167f17f19a5d842f74c3375468f68bf039eaa5

[media] bttv: rename field 'audio' in struct 'bttv' to 'audio_input'

'audio_input' better describes the meaning of this field.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/pci/bt8xx/bttvp.h

diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index e7910e0..9c1cc2c 100644
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -423,7 +423,7 @@
 
 	/* video state */
 	unsigned int input;
-	unsigned int audio;
+	unsigned int audio_input;
 	unsigned int mute;
 	unsigned long tv_freq;
 	unsigned int tvnorm;