Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[karo-tx-linux.git] / include / sound / cs46xx.h

diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 80b2979c0cba94c01945faf452d5523ee3c245ed..353910ce97556507ce6208c19cb1870f827d5769 100644 (file)
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -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;
 
@@ -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,