diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 21:47:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 21:47:21 -0800 |
| commit | 48d224d1efec98b0b78e511150b4f5752beceb7c (patch) | |
| tree | 6777113a72a73fdf4e8d84f7447c32b25fa902a9 /arch/arm/mach-omap2/omap_hwmod_2420_data.c | |
| parent | 9121dfca73d81fa886f15610cac2bf372391f3eb (diff) | |
| parent | 45c3eb7d3a07eb08d1b5b0f5983a996d41610b84 (diff) | |
| download | talos-obmc-linux-48d224d1efec98b0b78e511150b4f5752beceb7c.tar.gz talos-obmc-linux-48d224d1efec98b0b78e511150b4f5752beceb7c.zip | |
Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm2
From Tony Lindgren:
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.
Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.
* tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
watchdog: OMAP: fixup for ARM multiplatform support
Conflicts due to surrounding changes in:
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index e8efe3d1da6c..b5efe58c0be0 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -15,8 +15,8 @@ #include <linux/i2c-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> - -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> +#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "l3_2xxx.h" |
