Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2208ca0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/cs46xx-drop-fw' into for-next

parents 049da9e8 ad233a5f

sound/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ config SND_CS46XX 
	tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"

	select SND_RAWMIDI

	select SND_AC97_CODEC

	select FW_LOADER

	help

	  Say Y here to include support for Cirrus Logic CS4610/CS4612/

	  CS4614/CS4615/CS4622/CS4624/CS4630/CS4280 chips.

sound/pci/cs46xx/cs46xx.h

+5 −0
Original line number Diff line number Diff line
@@ -1716,9 +1716,14 @@ struct snd_cs46xx { 
	struct snd_pcm *pcm_rear;

	struct snd_pcm *pcm_center_lfe;

	struct snd_pcm *pcm_iec958;



#define CS46XX_DSP_MODULES	5

	struct dsp_module_desc *modules[CS46XX_DSP_MODULES];

#else /* for compatibility */

	struct snd_cs46xx_pcm *playback_pcm;

	unsigned int play_ctl;



	struct ba1_struct *ba1;

#endif



#ifdef CONFIG_PM_SLEEP