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

diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 199b5098ff7..e3005a674a2 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,14 +1704,12 @@ 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;
 
-#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
-	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 +1720,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,