Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / soc / imx / imx-ssi.h

diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h
index 55f26ebcd8c2531fc9267e12a6e590ac50199ad7..a4406a13489279280a1635f0dab2563475c7426f 100644 (file)
--- a/sound/soc/imx/imx-ssi.h
+++ b/sound/soc/imx/imx-ssi.h
@@ -183,11 +183,11 @@
 #define IMX_SSI_RX_DIV_PSR     4
 #define IMX_SSI_RX_DIV_PM      5
 
-extern struct snd_soc_dai imx_ssi_pcm_dai[2];
-extern struct snd_soc_platform imx_soc_platform;
-
 #define DRV_NAME "imx-ssi"
 
+#include <linux/dmaengine.h>
+#include <mach/dma.h>
+
 struct imx_pcm_dma_params {
        int dma;
        unsigned long dma_addr;
@@ -197,7 +197,7 @@ struct imx_pcm_dma_params {
 struct imx_ssi {
        struct platform_device *ac97_dev;
 
-       struct snd_soc_device imx_ac97;
+       struct snd_soc_dai *imx_ac97;
        struct clk *clk;
        void __iomem *base;
        int irq;
@@ -213,6 +213,9 @@ struct imx_ssi {
        struct imx_pcm_dma_params       dma_params_tx;
 
        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,