Commit 6f8c9d21 authored by Tony Lindgren's avatar Tony Lindgren Committed by Linus Torvalds

ARM: OMAP2+: Trivial fix for IOMMU merge issue

Commit 787314c3 ("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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98219727
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/iommu-omap.h> #include <linux/platform_data/iommu-omap.h>
#include <plat/omap_hwmod.h> #include "omap_hwmod.h"
#include <plat/omap_device.h> #include "omap_device.h"
static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment