aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-08-13 05:51:15 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-08-13 07:53:07 -0400
commit8dcf470760b74c41e7c93deebc2ff60af3908c97 (patch)
tree919d5343fa075c2f20dd25e65f7b285801c2f193
parentd0bc2f7d96e6d192f9840d10a68e30b2e69a04cd (diff)
ARM: u300: move DMA channel header into mach-u300
We were broadcasting <mach/dma_channels.h> to the entire kernel for no reason at all, push this down into the machine folder where it belongs. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-u300/core.c2
-rw-r--r--arch/arm/mach-u300/dma_channels.h (renamed from arch/arm/mach-u300/include/mach/dma_channels.h)0
-rw-r--r--arch/arm/mach-u300/spi.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index bc2339192fd9..31cc9267efc1 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -45,12 +45,12 @@
45#include <mach/coh901318.h> 45#include <mach/coh901318.h>
46#include <mach/hardware.h> 46#include <mach/hardware.h>
47#include <mach/syscon.h> 47#include <mach/syscon.h>
48#include <mach/dma_channels.h>
49 48
50#include "timer.h" 49#include "timer.h"
51#include "spi.h" 50#include "spi.h"
52#include "i2c.h" 51#include "i2c.h"
53#include "u300-gpio.h" 52#include "u300-gpio.h"
53#include "dma_channels.h"
54 54
55/* 55/*
56 * Static I/O mappings that are needed for booting the U300 platforms. The 56 * Static I/O mappings that are needed for booting the U300 platforms. The
diff --git a/arch/arm/mach-u300/include/mach/dma_channels.h b/arch/arm/mach-u300/dma_channels.h
index 4e8a88fbca49..4e8a88fbca49 100644
--- a/arch/arm/mach-u300/include/mach/dma_channels.h
+++ b/arch/arm/mach-u300/dma_channels.h
diff --git a/arch/arm/mach-u300/spi.c b/arch/arm/mach-u300/spi.c
index a1affacfa59c..02e6659286d5 100644
--- a/arch/arm/mach-u300/spi.c
+++ b/arch/arm/mach-u300/spi.c
@@ -12,7 +12,7 @@
12#include <linux/amba/pl022.h> 12#include <linux/amba/pl022.h>
13#include <linux/err.h> 13#include <linux/err.h>
14#include <mach/coh901318.h> 14#include <mach/coh901318.h>
15#include <mach/dma_channels.h> 15#include "dma_channels.h"
16 16
17/* 17/*
18 * The following is for the actual devices on the SSP/SPI bus 18 * The following is for the actual devices on the SSP/SPI bus