diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-22 23:27:17 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-22 23:27:17 +0900 |
| commit | 69c1f05379a34786da96d0fdedc111cdcdecdf6f (patch) | |
| tree | 74a0cde11fbc619c227af89e0757036ab20323d0 /sound/soc/intel/sst-dsp.c | |
| parent | 007dfe5ad6d039df784b44285bae89654eab3258 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| download | linux-69c1f05379a34786da96d0fdedc111cdcdecdf6f.tar.bz2 | |
Merge 3.15-rc6 into staging-next.
This resolves the conflicts in the files:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/intel/sst-dsp.c')
| -rw-r--r-- | sound/soc/intel/sst-dsp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c index 0c129fd85ecf..0b715b20a2d7 100644 --- a/sound/soc/intel/sst-dsp.c +++ b/sound/soc/intel/sst-dsp.c @@ -337,6 +337,7 @@ struct sst_dsp *sst_dsp_new(struct device *dev, spin_lock_init(&sst->spinlock); mutex_init(&sst->mutex); sst->dev = dev; + sst->dma_dev = pdata->dma_dev; sst->thread_context = sst_dev->thread_context; sst->sst_dev = sst_dev; sst->id = pdata->id; |