ARM: OMAP: Merge iommu2.h into iommu.h
authorIdo Yariv <ido@wizery.com>
Fri, 2 Nov 2012 19:23:56 +0000 (12:23 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Nov 2012 18:03:13 +0000 (10:03 -0800)
commit8953fe54e7bd0f8cf1a763204e0e3b9e32bcc223
treef29d8e9cab5b91cd98f8d5071a105f989fcb7994
parentddffeb8c4d0331609ef2581d84de4d763607bd37
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>
arch/arm/plat-omap/include/plat/iommu.h
arch/arm/plat-omap/include/plat/iommu2.h [deleted file]