summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs/mxs-pcm.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-18 18:22:37 +0100
committerTakashi Iwai <tiwai@suse.de>2012-03-18 18:22:37 +0100
commitcb3f2adc03ab055b19c677a6283523861fafebdd (patch)
tree59cfb6800f0635a4aec16c8e0da619f27e51ee79 /sound/soc/mxs/mxs-pcm.h
parentMerge branch 'topic/misc' into for-linus (diff)
parentMerge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff)
downloadlinux-cb3f2adc03ab055b19c677a6283523861fafebdd.tar.xz
linux-cb3f2adc03ab055b19c677a6283523861fafebdd.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/mxs/mxs-pcm.h')
-rw-r--r--sound/soc/mxs/mxs-pcm.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h
index f55ac4f7a76a..5f01a9124b3d 100644
--- a/sound/soc/mxs/mxs-pcm.h
+++ b/sound/soc/mxs/mxs-pcm.h
@@ -19,25 +19,9 @@
#ifndef _MXS_PCM_H
#define _MXS_PCM_H
-#include <mach/dma.h>
-
struct mxs_pcm_dma_params {
int chan_irq;
int chan_num;
};
-struct mxs_pcm_runtime_data {
- int period_bytes;
- int periods;
- int dma;
- unsigned long offset;
- unsigned long size;
- void *buf;
- int period_time;
- struct dma_async_tx_descriptor *desc;
- struct dma_chan *dma_chan;
- struct mxs_dma_data dma_data;
- struct mxs_pcm_dma_params *dma_params;
-};
-
#endif