From: Ido Yariv <ido@wizery.com>
Date: Fri, 2 Nov 2012 19:23:56 +0000 (-0700)
Subject: ARM: OMAP: Merge iommu2.h into iommu.h
X-Git-Tag: omap-for-v3.8/cleanup-headers-iommu-signed~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8953fe54e7bd0f8cf1a763204e0e3b9e32bcc223;p=pandora-kernel.git

ARM: OMAP: Merge iommu2.h into iommu.h

Since iommu is not supported on OMAP1 and will not likely to ever be
supported, merge plat/iommu2.h into iommu.h so only one file would have
to move to platform_data/ as part of the single zImage effort.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed