diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-09-23 10:18:11 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 11:01:04 -0400 |
commit | 3d588f83e4d6a5230d9094b97d38621cbaa9a972 (patch) | |
tree | 376a10e65eef40977b14439e212d9b8a49c732e9 /sound | |
parent | 46e8c83c83c06b90ebc000df481c2fdcee79a141 (diff) |
dmaengine: dw: split dma-dw.h to platform and private parts
The introduced include/linux/dma/dw.h is going to contain the private
extensions and structures which are shared for dw_dmac users in the kernel.
Meanwhile include/linux/platform_data/dma-dw.h keeps only platform related data
types and definitions.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/atmel/abdac.c | 4 | ||||
-rw-r--r-- | sound/atmel/ac97c.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 154a7c44e38d..31061e3521d4 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c | |||
@@ -9,7 +9,6 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/clk.h> | 10 | #include <linux/clk.h> |
11 | #include <linux/bitmap.h> | 11 | #include <linux/bitmap.h> |
12 | #include <linux/platform_data/dma-dw.h> | ||
13 | #include <linux/dmaengine.h> | 12 | #include <linux/dmaengine.h> |
14 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
@@ -25,6 +24,9 @@ | |||
25 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
26 | #include <sound/atmel-abdac.h> | 25 | #include <sound/atmel-abdac.h> |
27 | 26 | ||
27 | #include <linux/platform_data/dma-dw.h> | ||
28 | #include <linux/dma/dw.h> | ||
29 | |||
28 | /* DAC register offsets */ | 30 | /* DAC register offsets */ |
29 | #define DAC_DATA 0x0000 | 31 | #define DAC_DATA 0x0000 |
30 | #define DAC_CTRL 0x0008 | 32 | #define DAC_CTRL 0x0008 |
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 1dfb35afef8f..b59427d5a697 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <sound/memalloc.h> | 32 | #include <sound/memalloc.h> |
33 | 33 | ||
34 | #include <linux/platform_data/dma-dw.h> | 34 | #include <linux/platform_data/dma-dw.h> |
35 | #include <linux/dma/dw.h> | ||
35 | 36 | ||
36 | #include <mach/cpu.h> | 37 | #include <mach/cpu.h> |
37 | 38 | ||