diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-01-04 13:56:16 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-01-07 17:36:28 +0100 |
| commit | 2b9277ad77e2b14a6bb113cc6c0da5101abc5261 (patch) | |
| tree | 92aa8ba39d7723a71457d3009f1ec7290eb48af5 | |
| parent | 9aab4d6f087a042d702b6e16346378731eeaf48e (diff) | |
| download | linux-3.10-2b9277ad77e2b14a6bb113cc6c0da5101abc5261.tar.gz linux-3.10-2b9277ad77e2b14a6bb113cc6c0da5101abc5261.tar.bz2 linux-3.10-2b9277ad77e2b14a6bb113cc6c0da5101abc5261.zip | |
dma: coh901318: push header down into the DMA subsystem
The defines in U300's <mach/coh901318.h> are now only used by
the DMA engine driver itself, so move the header down into the
DMA subsystem.
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-u300/core.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-u300/spi.c | 1 | ||||
| -rw-r--r-- | drivers/dma/coh901318.c | 2 | ||||
| -rw-r--r-- | drivers/dma/coh901318.h (renamed from arch/arm/mach-u300/include/mach/coh901318.h) | 6 | ||||
| -rw-r--r-- | drivers/dma/coh901318_lli.c | 2 | ||||
| -rw-r--r-- | drivers/dma/coh901318_lli.h | 2 |
6 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 834d0bd2aa0..19f5c5311f4 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -41,7 +41,6 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <mach/coh901318.h> #include <mach/hardware.h> #include <mach/syscon.h> #include <mach/irqs.h> diff --git a/arch/arm/mach-u300/spi.c b/arch/arm/mach-u300/spi.c index b34567f944c..910698293d6 100644 --- a/arch/arm/mach-u300/spi.c +++ b/arch/arm/mach-u300/spi.c @@ -12,7 +12,6 @@ #include <linux/amba/pl022.h> #include <linux/platform_data/dma-coh901318.h> #include <linux/err.h> -#include <mach/coh901318.h> /* * The following is for the actual devices on the SSP/SPI bus diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 7fa54fb7ab6..1be69b87a91 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -22,8 +22,8 @@ #include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/platform_data/dma-coh901318.h> -#include <mach/coh901318.h> +#include "coh901318.h" #include "coh901318_lli.h" #include "dmaengine.h" diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/drivers/dma/coh901318.h index 185fc59fd72..9353c40b152 100644 --- a/arch/arm/mach-u300/include/mach/coh901318.h +++ b/drivers/dma/coh901318.h @@ -1,9 +1,5 @@ /* - * - * include/linux/coh901318.h - * - * - * Copyright (C) 2007-2009 ST-Ericsson + * Copyright (C) 2007-2013 ST-Ericsson * License terms: GNU General Public License (GPL) version 2 * DMA driver for COH 901 318 * Author: Per Friden <per.friden@stericsson.com> diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c index 780e0429b38..e25cac0af3f 100644 --- a/drivers/dma/coh901318_lli.c +++ b/drivers/dma/coh901318_lli.c @@ -11,8 +11,8 @@ #include <linux/memory.h> #include <linux/gfp.h> #include <linux/dmapool.h> -#include <mach/coh901318.h> +#include "coh901318.h" #include "coh901318_lli.h" #if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_U300_DEBUG)) diff --git a/drivers/dma/coh901318_lli.h b/drivers/dma/coh901318_lli.h index abff3714fdd..0c7caceef63 100644 --- a/drivers/dma/coh901318_lli.h +++ b/drivers/dma/coh901318_lli.h @@ -10,8 +10,6 @@ #ifndef COH901318_LLI_H #define COH901318_LLI_H -#include <mach/coh901318.h> - struct device; struct coh901318_pool { |