Pull video into test branch

[linux-2.6] / include / sound / ak4531_codec.h

diff --git a/include/sound/ak4531_codec.h b/include/sound/ak4531_codec.h
index 4e7c661af484126f91213a5f1bd1ae21507a076b..fb30faab43a83186279ef037e515ae9815f4eea3 100644 (file)
--- a/include/sound/ak4531_codec.h
+++ b/include/sound/ak4531_codec.h
@@ -71,10 +71,15 @@ struct snd_ak4531 {
        void (*private_free) (struct snd_ak4531 *ak4531);
        /* --- */
        unsigned char regs[0x20];
-       struct semaphore reg_mutex;
+       struct mutex reg_mutex;
 };
 
 int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531,
                     struct snd_ak4531 **rak4531);
 
+#ifdef CONFIG_PM
+void snd_ak4531_suspend(struct snd_ak4531 *ak4531);
+void snd_ak4531_resume(struct snd_ak4531 *ak4531);
+#endif
+
 #endif /* __SOUND_AK4531_CODEC_H */