summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/board-mop500-sdi.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-06 07:47:09 -0800
committerOlof Johansson <olof@lixom.net>2012-11-06 07:47:09 -0800
commitf75ed2d39562e19e4d1896c07e7f091515c6d11d (patch)
tree7201003953c26912b7dd0b39f2a893b7f01e6f81 /arch/arm/mach-ux500/board-mop500-sdi.c
parentc2d8c259bfce056437e8dbc4b048944050f9b567 (diff)
parentc3b9d1db23c4ebd4d8a0964ebcf5f27d4eb8fa3f (diff)
Merge tag 'kill-plat-sparse-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into next/multiplatform
From Linus Walleij: This patchset will: - Move all remaining headers out of arch/arm/plat-nomadik/include/plat out to e.g. include/linux/platform_data - Delete arch/arm/plat-nomadik - Convert Nomadik and Ux500 to SPARSE_IRQ * tag 'kill-plat-sparse-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: ARM: plat-nomadik: convert platforms to SPARSE_IRQ mfd/db8500-prcmu: use the irq_domain_add_simple() mfd/ab8500-core: use irq_domain_add_simple() ARM: plat-nomadik: move MTU, kill plat-nomadik ARM: plat-nomadik: move DMA40 header to <linux/platform_data> ARM: plat-nomadik: use DIV_ROUND_CLOSEST() ARM: plat-nomadik: pass IRQ to timer driver clk/ux500: explicitly include register header pinctrl/nomadik: merge old pincfg header pinctrl/nomadik: move the platform data header ARM: plat-nomadik: move NMK_GPIO_PER_CHIP into gpio-nomadik.h ARM: plat-nomadik: Introduce new DB8540 GPIO registers
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-sdi.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500-sdi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 9c8e4a9e83e..051b62c2710 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -11,9 +11,9 @@
#include <linux/amba/mmci.h>
#include <linux/mmc/host.h>
#include <linux/platform_device.h>
+#include <linux/platform_data/dma-ste-dma40.h>
#include <asm/mach-types.h>
-#include <plat/ste_dma40.h>
#include <mach/devices.h>
#include <mach/hardware.h>