Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[linux-2.6.git] / drivers / media / video / saa7134 / saa7134.h
index 17ba34f30760e915dff740505c44281f8a9ce486..ce1c2e0b065ee84f1b1052a5c7fc14c19c049cbd 100644 (file)
@@ -397,7 +397,7 @@ struct saa7134_dmasound {
        unsigned int               read_offset;
        unsigned int               read_count;
        void *                     priv_data;
-       snd_pcm_substream_t        *substream;
+       struct snd_pcm_substream   *substream;
 };
 
 /* IR input */