diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-20 20:50:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 23:15:26 +0100 |
| commit | 6f8c9d2130893eda35ad9105e6e2a08db7f0da13 (patch) | |
| tree | 3dfcbd88b40daa39184aa03861093c747d227ad1 /arch/arm/mach-omap2/omap-iommu.c | |
| parent | Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-6f8c9d2130893eda35ad9105e6e2a08db7f0da13.tar.xz linux-6f8c9d2130893eda35ad9105e6e2a08db7f0da13.zip | |
ARM: OMAP2+: Trivial fix for IOMMU merge issue
Commit 787314c35fbb ("Merge tag 'iommu-updates-v3.8' of
git://git./linux/kernel/git/joro/iommu") did not account for the changed
header location.
The headers were made local to mach-omap2 as they are specific to omap2+
only, and we wanted to get most of the #include <plat/*.h> headers fixed
up anyways for the ARM multiplatform support.
We attempted to avoid this kind of merge conflict early on by setting up
a minimal git branch shared by the arm-soc tree and the iommu tree, but
looks like we still hit a merge issue there as the branches got merged
as various topic branches.
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-omap2/omap-iommu.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index 7642fc4672c1..6da4f7ae9d7f 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -16,8 +16,8 @@ #include <linux/slab.h> #include <linux/platform_data/iommu-omap.h> -#include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_hwmod.h" +#include "omap_device.h" static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) { |