diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
| commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
| tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/soc/intel/sst-mfld-platform.h | |
| parent | ALSA: usb-audio: Don't attempt to get Microsoft Lifecam Cinema sample rate (diff) | |
| parent | ALSA: control: Fix a typo of SNDRV_CTL_ELEM_ACCESS_TLV_* with SNDRV_CTL_TLV_OP_* (diff) | |
| download | linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.xz linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/intel/sst-mfld-platform.h')
| -rw-r--r-- | sound/soc/intel/sst-mfld-platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-mfld-platform.h b/sound/soc/intel/sst-mfld-platform.h index 79c8d1246a8f..9094314be2b0 100644 --- a/sound/soc/intel/sst-mfld-platform.h +++ b/sound/soc/intel/sst-mfld-platform.h @@ -174,6 +174,7 @@ struct sst_data { struct sst_platform_data *pdata; struct snd_sst_bytes_v2 *byte_stream; struct mutex lock; + struct snd_soc_card *soc_card; }; int sst_register_dsp(struct sst_device *sst); int sst_unregister_dsp(struct sst_device *sst); |