projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14-rc1' into patchwork
[deliverable/linux.git]
/
sound
/
pci
/
cs46xx
/
cs46xx.h
diff --git
a/sound/pci/cs46xx/cs46xx.h
b/sound/pci/cs46xx/cs46xx.h
index fc339ef0a0ae439a87087753a4bfaf6e28de9742..c49a082c378b6c711e36d74187ef742318be56ce 100644
(file)
--- a/
sound/pci/cs46xx/cs46xx.h
+++ b/
sound/pci/cs46xx/cs46xx.h
@@
-1716,9
+1716,14
@@
struct snd_cs46xx {
struct snd_pcm *pcm_rear;
struct snd_pcm *pcm_center_lfe;
struct snd_pcm *pcm_iec958;
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;
#else /* for compatibility */
struct snd_cs46xx_pcm *playback_pcm;
unsigned int play_ctl;
+
+ struct ba1_struct *ba1;
#endif
#ifdef CONFIG_PM_SLEEP
#endif
#ifdef CONFIG_PM_SLEEP
This page took
0.024172 seconds
and
5
git commands to generate.