Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 22 insertions, 0 deletions

diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h
new file mode 100644
index 000000000000..c50659269a40
--- /dev/null
+++ b/sound/soc/samsung/dma.h
@@ -0,0 +1,22 @@
+/*
+ *  dma.h --
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  ALSA PCM interface for the Samsung S3C24xx CPU
+ */
+
+#ifndef _S3C_AUDIO_H
+#define _S3C_AUDIO_H
+
+struct s3c_dma_params {
+        struct s3c2410_dma_client *client;      /* stream identifier */
+        int channel;                            /* Channel ID */
+        dma_addr_t dma_addr;
+        int dma_size;                   /* Size of the DMA transfer */
+};
+
+#endif