linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / sound / cs46xx.h

diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 685928e..199b509 100644 (file)
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -1704,7 +1704,6 @@ struct snd_cs46xx {
        int acpi_port;
        struct snd_kcontrol *eapd_switch; /* for amplifier hack */
        int accept_valid;       /* accept mmap valid (for OSS) */
-       int in_suspend;
 
        struct gameport *gameport;
 
@@ -1712,7 +1711,7 @@ struct snd_cs46xx {
        int current_gpio;
 #endif
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-       struct mutex spos_mutex;
+       struct semaphore spos_mutex;
 
        struct dsp_spos_instance * dsp_spos_instance;