X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fsound%2Fcs46xx.h;h=6b40ee60f4c56d0d3c37db84a15b167eb3881771;hb=4acadb965c4aa587aac29a0a91203c4745d6fb4e;hp=199b5098ff7e8e0fed8972f99b1f8d7a7d22d0f2;hpb=ed03f430cdc8c802652467e9097606fedc2c7abc;p=~andy%2Flinux

diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 199b5098ff7..6b40ee60f4c 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -2,7 +2,7 @@
 #define __SOUND_CS46XX_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *		     Cirrus Logic, Inc.
  *  Definitions for Cirrus Logic CS46xx chips
  *
@@ -1704,6 +1704,7 @@ 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;
 
@@ -1711,7 +1712,7 @@ struct snd_cs46xx {
 	int current_gpio;
 #endif
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-	struct semaphore spos_mutex;
+	struct mutex spos_mutex;
 
 	struct dsp_spos_instance * dsp_spos_instance;
 
@@ -1722,6 +1723,10 @@ struct snd_cs46xx {
 	struct snd_cs46xx_pcm *playback_pcm;
 	unsigned int play_ctl;
 #endif
+
+#ifdef CONFIG_PM
+	u32 *saved_regs;
+#endif
 };
 
 int snd_cs46xx_create(struct snd_card *card,