diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 11:22:33 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 12:07:21 +0400 |
| commit | e3a66aa33a8f06924f67770e15c22a5c52df314e (patch) | |
| tree | fb8786f1300bdce8f6fc7462e3fd5699e057dd24 /drivers/dma | |
| parent | be2109e13fc6f017040c57615acfe1065723687b (diff) | |
| parent | 6884b680459ab850f99fc37605084187bc9888ac (diff) | |
| download | linux-e3a66aa33a8f06924f67770e15c22a5c52df314e.tar.xz | |
Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/at_hdmac_regs.h | 2 | ||||
| -rw-r--r-- | drivers/dma/ep93xx_dma.c | 2 | ||||
| -rw-r--r-- | drivers/dma/imx-dma.c | 2 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 | ||||
| -rw-r--r-- | drivers/dma/mmp_tdma.c | 2 | ||||
| -rw-r--r-- | drivers/dma/mv_xor.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h index 8a6c8e8b2940..116e4adffb08 100644 --- a/drivers/dma/at_hdmac_regs.h +++ b/drivers/dma/at_hdmac_regs.h @@ -11,7 +11,7 @@ #ifndef AT_HDMAC_REGS_H #define AT_HDMAC_REGS_H -#include <mach/at_hdmac.h> +#include <linux/platform_data/dma-atmel.h> #define AT_DMA_MAX_NR_CHANNELS 8 diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index c64917ec313d..4aeaea77f72e 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -26,7 +26,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> -#include <mach/dma.h> +#include <linux/platform_data/dma-ep93xx.h> #include "dmaengine.h" diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 5084975d793c..b90aaec4ccc4 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -28,7 +28,7 @@ #include <linux/module.h> #include <asm/irq.h> -#include <mach/dma.h> +#include <linux/platform_data/dma-imx.h> #include <mach/hardware.h> #include "dmaengine.h" diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 1dc2a4ad0026..1b781d6ac425 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -38,8 +38,8 @@ #include <linux/of_device.h> #include <asm/irq.h> -#include <mach/sdma.h> -#include <mach/dma.h> +#include <linux/platform_data/dma-imx-sdma.h> +#include <linux/platform_data/dma-imx.h> #include <mach/hardware.h> #include "dmaengine.h" diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index 8a15cf2163dc..07fa48688ba9 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@ -19,7 +19,7 @@ #include <linux/platform_device.h> #include <linux/device.h> #include <mach/regs-icu.h> -#include <mach/sram.h> +#include <linux/platform_data/dma-mmp_tdma.h> #include "dmaengine.h" diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 0b12e68bf79c..e362e2b80efb 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -26,7 +26,7 @@ #include <linux/platform_device.h> #include <linux/memory.h> #include <linux/clk.h> -#include <plat/mv_xor.h> +#include <linux/platform_data/dma-mv_xor.h> #include "dmaengine.h" #include "mv_xor.h" |