| Message ID | 20121220195033.GI21056@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
--- 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) {
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: Tony Lindgren <tony@atomide.com> --- Found one more merge issue with the recent IOMMU merge. Linus, maybe apply this fix directly as Olof's branch is based on an earlier commit?