diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:41:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:41:17 +0100 |
commit | 9e8c32cac9929858337e29dd4e28fd87bc073ef5 (patch) | |
tree | 81643da2131561b729a09adbbced293b008c6cbf /sound/soc/imx/imx-ssi.h | |
parent | ALSA: hda - Identify more variants for ALC269 (diff) | |
parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc (diff) | |
download | linux-dev-9e8c32cac9929858337e29dd4e28fd87bc073ef5.tar.xz linux-dev-9e8c32cac9929858337e29dd4e28fd87bc073ef5.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/imx/imx-ssi.h')
-rw-r--r-- | sound/soc/imx/imx-ssi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h index 53b780d9b2b0..a4406a134892 100644 --- a/sound/soc/imx/imx-ssi.h +++ b/sound/soc/imx/imx-ssi.h @@ -185,6 +185,9 @@ #define DRV_NAME "imx-ssi" +#include <linux/dmaengine.h> +#include <mach/dma.h> + struct imx_pcm_dma_params { int dma; unsigned long dma_addr; @@ -212,6 +215,7 @@ struct imx_ssi { int enabled; struct platform_device *soc_platform_pdev; + struct platform_device *soc_platform_pdev_fiq; }; struct snd_soc_platform *imx_ssi_fiq_init(struct platform_device *pdev, |