Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / include / sound / vx_core.h

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 0a85c37d1bc7288da471d03156271e39b8315185..9821a6194caae33ebb72dabe803a83a0b6b91e15 100644 (file)
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -206,7 +206,7 @@ struct vx_core {
        int audio_monitor[4];                   /* playback hw-monitor level */
        unsigned char audio_monitor_active[4];  /* playback hw-monitor mute/unmute */
 
-       struct semaphore mixer_mutex;
+       struct mutex mixer_mutex;
 
        const struct firmware *firmware[4]; /* loaded firmware data */
 };
@@ -346,6 +346,12 @@ void vx_set_internal_clock(struct vx_core *chip, unsigned int freq);
 int vx_change_frequency(struct vx_core *chip);
 
 
+/*
+ * PM
+ */
+int snd_vx_suspend(struct vx_core *card, pm_message_t state);
+int snd_vx_resume(struct vx_core *card);
+
 /*
  * hardware constants
  */