From 6f8c9d2130893eda35ad9105e6e2a08db7f0da13 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Dec 2012 11:50:34 -0800 Subject: 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 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 Signed-off-by: Tony Lindgren Signed-off-by: Linus Torvalds --- arch/arm/mach-omap2/omap-iommu.c | 4 ++-- 1 file 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 #include -#include -#include +#include "omap_hwmod.h" +#include "omap_device.h" static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) { -- cgit v1.2.3