Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[pandora-kernel.git] / include / sound / tea575x-tuner.h

diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index b82e408..b5067d3 100644 (file)
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -20,19 +20,20 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- */      
+ */
 
 #include <linux/videodev.h>
+#include <media/v4l2-dev.h>
 
-typedef struct snd_tea575x tea575x_t;
+struct snd_tea575x;
 
 struct snd_tea575x_ops {
-       void (*write)(tea575x_t *tea, unsigned int val);
-       unsigned int (*read)(tea575x_t *tea);
+       void (*write)(struct snd_tea575x *tea, unsigned int val);
+       unsigned int (*read)(struct snd_tea575x *tea);
 };
 
 struct snd_tea575x {
-       snd_card_t *card;
+       struct snd_card *card;
        struct video_device vd;         /* video device */
        struct file_operations fops;
        int dev_nr;                     /* requested device number + 1 */
@@ -45,7 +46,7 @@ struct snd_tea575x {
        void *private_data;
 };
 
-void snd_tea575x_init(tea575x_t *tea);
-void snd_tea575x_exit(tea575x_t *tea);
+void snd_tea575x_init(struct snd_tea575x *tea);
+void snd_tea575x_exit(struct snd_tea575x *tea);
 
 #endif /* __SOUND_TEA575X_TUNER_H */