---

yaml --- r: 138017 b: refs/heads/master c: 9b76ede h: refs/heads/master i: 138015: b6974ee v: v3
git-mirror · Mar 30, 2009 · 9b144ba · 9b144ba
1 parent 3cc0a2f
commit 9b144ba
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 101 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f8841e8a17367a85a60b6d30eff7858d9d1598
+refs/heads/master: 9b76ede411145d7456ae5e467b65003ca7990b06
diff --git a/trunk/include/sound/tea575x-tuner.h b/trunk/include/sound/tea575x-tuner.h
@@ -22,8 +22,9 @@
  *
  */
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-dev.h>
+#include <media/v4l2-ioctl.h>
 
 struct snd_tea575x;
 
@@ -35,11 +36,10 @@ struct snd_tea575x_ops {
 
 struct snd_tea575x {
 	struct snd_card *card;
-	struct video_device vd;		/* video device */
-	struct v4l2_file_operations fops;
+	struct video_device *vd;	/* video device */
 	int dev_nr;			/* requested device number + 1 */
-	int vd_registered;		/* video device is registered */
 	int tea5759;			/* 5759 chip is present */
+	int mute;			/* Device is muted? */
 	unsigned int freq_fixup;	/* crystal onboard */
 	unsigned int val;		/* hw value */
 	unsigned long freq;		/* frequency */