diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-11 16:54:28 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-11 16:54:28 +0300 |
commit | 7b2f32cc81e14149e2fe515f69f35f9e11e8ba5a (patch) | |
tree | dac5980859c5af6566c7f9be2a12c7b68651eea9 /sound/soc/intel/common/sst-dsp.h | |
parent | b7f08d29c9ef76fb4bc95385e3f90b51e0494a3b (diff) | |
parent | fe09dd8eb2310ec658f49a5431df2259f11cbe9e (diff) | |
download | linux-7b2f32cc81e14149e2fe515f69f35f9e11e8ba5a.tar.xz |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/common/sst-dsp.h')
-rw-r--r-- | sound/soc/intel/common/sst-dsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 859f0de00339..0b84c719ec48 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -216,7 +216,7 @@ struct sst_pdata { void *dsp; }; -#if IS_ENABLED(CONFIG_DW_DMAC_CORE) +#ifdef CONFIG_DW_DMAC_CORE /* Initialization */ struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata); |